| commit | 66effb82919d5b2cf5fd3569d6dd357afc40039e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 11:49:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 11:49:43 2013 -0700 |
| tree | de2262f9dc2730313d0359c661eda6a3117e8450 | |
| parent | d0962fa93b12633de336c8c49b53651c477186eb [diff] | |
| parent | 6992ac947b0e953b0d82101bac3941f8d3a4e138 [diff] |
am 6992ac94: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '6992ac947b0e953b0d82101bac3941f8d3a4e138':