OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 15:58:17 +0000 (08:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 15:58:17 +0000 (08:58 -0700)
commita8a731bf7fe8d42af56c7481acd99628dd1df2f0
tree2a54509d4aae599873fe33951d4f504d5a14b068
parentd50926a047d51f950cbe6c7588d4b168e0cfc3bb
parentba7bed755208fd72e626f14eb82c3f73643466c5
Reconcile with jb-mr0-release - do not merge

Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309