OSDN Git Service

Reconcile with jb-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 22:05:14 +0000 (15:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 22:05:14 +0000 (15:05 -0700)
commit4d5d510713ba79b044b0d62434e6067b2fb5fd01
treee7277be15e8b388b2de709ad97adf98b15320c89
parentdb7bda5cc74a757c91917e01fe9693adcab16684
parent1c39268a32b83ea2e023732896cded20bc8df521
Reconcile with jb-mr1-release

Change-Id: I748fdd61c5644211f2406b42eefa521e4d7ed2d7