OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:44 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:44 +0000 (07:31 -0700)
commit53c017961c78d7ed9e95ec081cf821db2ba91745
treecec99f2edf30d420d94bd4c8cd22573be52fdd9f
parent9695037c72a8d291cf731e220acd3807c87e4fb1
parent260abe07fcbc10542eb44aa75b905816a4b44a0a
Reconcile with jb-mr2-release - do not merge

Change-Id: Iafe6038c4a1cfd9f5fa19c0aa5697923ac7d3db8