OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:57:44 +0000 (09:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:57:44 +0000 (09:57 -0700)
commit31dab5994aac66e7e9bbe47ccaa399997d5b2d95
tree44bcce495cb9b4e5865b481b41ef3e884b721726
parentd5393476007ae204387783a016e74aea5f1a147b
parentcf24ade7062c197d399634b41625629bdeaf5505
Reconcile with jb-mr1-release - do not merge

Change-Id: I84f209a40227014231778a0b30a3d6a2c523e3e3