commit | 63ddacee4d068bf243104ceb3031dc15987eda90 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 20 17:31:51 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 20 17:31:51 2013 -0700 |
tree | ba5c1cd3f60ad35fb77a9a7fe76274f6387b27ac | |
parent | 3d828aa727a1127c28c1a535aebceb3af992f569 [diff] | |
parent | 2f47c8f74fd45197549c946cb0b1a0d6eeb5b176 [diff] | |
parent | 519720ddf06e8cbac86d3faabaeae129d6769cb8 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I5ed80e588eaaed9872e22aa2c0a362723a698f3a