OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:28 +0000 (07:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:28 +0000 (07:48 -0700)
commitaf4324cc0ad6fb4d4a7716ebff2421424c4a2292
tree1006b8b14ccb70b77173f4ba53c53051bcddc8e0
parent2526675e907dd9b3d224760a87185c017f66a796
parent5031729a37b510959244e076bb1c4b06e1095f74
Reconcile with jb-mr1-release - do not merge

Change-Id: I4e8f1a58de984fa0945b9df9e8bc230c11e7fc58