OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Aug 2012 15:17:08 +0000 (08:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Aug 2012 15:17:08 +0000 (08:17 -0700)
commit9f2ef2fbf5cb26089828ea1b588253bd20ddefa5
tree9907e7f794f0d96ae2a43894a9efab73a695c104
parent6eef3a3667fa763717cdab25686c1e6676f8e820
parenta1f4bf8412eaec2e3dd72615d357132c3f69a7a0
Reconcile with jb-mr1-release - do not merge

Change-Id: I939b3c749ca86343996e1d4aefb32a7f30df037a