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:34:55 +0000 (10:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:34:55 +0000 (10:34 -0700)
commit5ad242334a286bac445fb883ffbc8767cd9714d1
treebdb41115ceeaf2b667dec9e8e8b38a0837e7fcbe
parent61ff681bb2791479ff54de33732e4351db5328d4
parentcd22a00c090f3f701cdc96dcaccb8e91706281fc
Reconcile with jb-mr1-release - do not merge

Change-Id: I2574f76e658ad480d22c600a6e1e4f7b251a1749