OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:15:38 +0000 (07:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:15:38 +0000 (07:15 -0700)
commitb1452579d000f56b078c1cc537f0028fe9224b61
treea46a1d48b4cbc337ab82fbc7e72fbc9265a5e907
parent59d9999f713cabe68db8c75e5436a8bb2f992b7e
parent63118a85fe3e6d8a85c7f45373d946a0e0c99d28
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib08f0574bce5b926a38d9a0fd428da003e7cf2c3