| commit | c44981dca2b5d13106ae4eb8428f342a0385d303 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:52:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 15:52:24 2013 -0700 |
| tree | e330e687ec5fa3884bdcb19ba87af33e4b5548cd | |
| parent | 0927e678c10eeecb3371dbbcf820745d6f74e1c6 [diff] | |
| parent | 5b734503a42beab7cc8d74d4fff20996cb6b5cb2 [diff] |
am 5b734503: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '5b734503a42beab7cc8d74d4fff20996cb6b5cb2':