OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:13 +0000 (07:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:13 +0000 (07:45 -0700)
commit6a92b35e3a64c90127fb87530c50e9a04a61c671
tree99003423e53dd497cc48c40193f0444915577b58
parentf30501e1e280e8b5637430ac2be79235ee16d018
parent6bd8dee87e96365e3ceb901a5ef935b32ca84cd9
Reconcile with jb-mr2-release - do not merge

Change-Id: If9501b8a4f0e4a1d6dc787c71457814360d11d2b