| commit | 73d5fe9f2e6edc11327b4a211f7d077e1e52cbb2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:37:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 26 12:37:53 2013 -0700 |
| tree | 75ace6ca6fd76539e1ed4911196fe556919623bc | |
| parent | 505e35bca9e19773e42cb8771fcf36158208b8ab [diff] | |
| parent | 1559d13184e225bdb4e45190cbb033c4777f5681 [diff] |
am 1559d131: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '1559d13184e225bdb4e45190cbb033c4777f5681':