OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:37:37 +0000 (10:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:37:37 +0000 (10:37 -0700)
commit2a9a63e9969080c9ce5d5f1631ddbc37842f69b2
treeecadd3bcafac66fec3f0de8e92db78506b69c9a2
parentf2471e413e79f2ae049228dd45f1b1290ccb28c8
parent53587260ba0873f45a220a2c37fd29ef4e21667e
parent7a14c10b8c84c3e0aa3d9621aad0350dddf94273
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I935b9694f3885d28f3d3af62459a91fb354ad6f2