OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:37:31 +0000 (10:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:37:31 +0000 (10:37 -0700)
commit4d48e3e0543d99e53668a036d782a6fb42d2b6f6
tree2f2e349082a6684d40de13a5aa163d0c9ec7460a
parente1e9c7d87f1253f26e54383958319fd48f1fcc7e
parenta8a3069a6f74e30acb70debefcac2d6f66707610
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic61db28563308c2da38d7b2c2c12e0486914ea17