OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:43 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:43 +0000 (08:05 -0700)
commitedf16ad654cbebd53ef7be0c585e0f1937340f06
tree21be0fe72467d9f8394eba3045d76c755523a101
parent4eb1825cb6c305f1c4479f55fac9047a4001b8e4
parent6659f8162702a8d8051f3e7f0f921f540010d0f8
Reconcile with jb-mr2-release - do not merge

Change-Id: I92222f8b210362d6a0bd2577216a5df5f822608a