| commit | 73c5a6f9347d149b5f0250febc74576d4a3e105f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 20 17:34:07 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 20 17:34:07 2013 -0700 |
| tree | af716d99203633177d142e4a98bb03582113cc24 | |
| parent | 33a0d8b1cb45fcf131667fba380ea90802c5d8a2 [diff] | |
| parent | 63ddacee4d068bf243104ceb3031dc15987eda90 [diff] |
am 63ddacee: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '63ddacee4d068bf243104ceb3031dc15987eda90': JWR66P JSR78C