commit | 1ca7356c5be39e9fa55eed4ac6115237ed0d73a9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:01 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:01 2013 -0700 |
tree | 62ef9567f122b39a4f8e950049135b26afe89fcc | |
parent | adc9b73da21ea12e53735e5a542d7170b65fa626 [diff] | |
parent | bcab814a5267b3ff334e74ea9b81dbf88cbe2e75 [diff] | |
parent | b36f5b8519e35f4280443acd19499ab05f262828 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: Ic39646ef7cada28af9b9fbccbc8b6e563be7b232