OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:06:12 +0000 (08:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:06:13 +0000 (08:06 -0700)
commita4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac
tree8fe518e778f27d12e62a4d88d6dd1f974850ee18
parent9e11dddd508dff7b8d24c56989d70c6ff67ca619
parent6f77438395dd96c1dece7ce050e3437c78e0aeb4
Reconcile with jb-mr2-release - do not merge

Change-Id: I2a6743d468c9daa2f59f5d249964bbe3abb274ca