commit | 8f20eded056a00b46bb9f128d43d6f7a2396d899 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:26:00 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 07:26:00 2013 -0700 |
tree | ae575f9f9d71125e3b3e1825ae07d71390c87725 | |
parent | f9952ab562d6c6476768a955ff58254aba294469 [diff] | |
parent | 97d2587d87d237dc319d335e2ca5ddc960062fca [diff] |
am cd9482d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'cd9482d961d1c14b6dea7279f8524e29908b6a27':