| commit | 6a96df3b335f8fc1b514fdcf95e8ded350fcf2b5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:37:51 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 26 12:37:51 2013 -0700 |
| tree | 0dd129a134165395c5c0c6005157c95b45df676c | |
| parent | 12dc899cb6135f101bf21a78583508a956bb1d6d [diff] | |
| parent | 0ab04716dcb05f085edcc80bbed3ecefcbec9c46 [diff] |
am 0ab04716: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '0ab04716dcb05f085edcc80bbed3ecefcbec9c46':