| commit | 3f1292fb5a1436c49561380ac23aaaa94ac8bb67 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:37:51 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 09:37:51 2013 -0700 |
| tree | b6702eb9fbc37816e799e9618fc865cd33be53bf | |
| parent | 7c85bea1787e07bd4968d60201d9520615ec45e4 [diff] | |
| parent | e69c2998bebbe2bf8e9f01ca6e644fd41c7914ec [diff] |
am e69c2998: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'e69c2998bebbe2bf8e9f01ca6e644fd41c7914ec':