| commit | 935a0f9de560fd4b59ba011e97f3c6dffc9c686a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:38:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 10:38:57 2013 -0700 |
| tree | 8280375b1ddf9e0179efbb61092907052943111d | |
| parent | 144281282b1d8b8cb9e6c9b50ad6ccd66da42838 [diff] | |
| parent | 9aaf2a65e3cbc6866cfd50fe5f3341063c71f36f [diff] |
am 9aaf2a65: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '9aaf2a65e3cbc6866cfd50fe5f3341063c71f36f':