tree ff66975e9ce284b507cdee299ef2b3bb283c0174
parent 3853a291450617d129f0567a53daa2af392a907f
author rluble <rluble@gmail.com> 1413483121 -0700
committer rluble <rluble@gmail.com> 1413496196 -0700

Rebase android-json to avoid conflicts with org.json.

This patch rebases android-json from org.json to c.g.g.thirdparty.json.

In the future it will probably make sense to migrate to unrebased GSON.

Bug: issue 8762.
Change-Id: I47352cebdd8d8092dd512f2bd6b623ff8022d854