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:05:57 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:05:57 +0000 (08:05 -0700)
commit197d3e077384087a8674bbfcbecf63a88e611426
tree2ff6050957f8eebf0d63cbd5cc904182d19f0946
parent9f013a46e150da01ebb267574d8095eef399cd0c
parent8617908345eff421b629d82b32f79e44efbf8de3
Reconcile with jb-mr2-release - do not merge

Change-Id: I55d8c1a91b9750864f82176768ea93bf11337726