| commit | 6fc25cfd156abe6225c8edf7892aba67f3e92168 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:37:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 09:37:54 2013 -0700 |
| tree | 9e5176aae7a185252cc9f3c3134dd7f945cab985 | |
| parent | c137d8701735261f25c1982009be9b83fda5a1b5 [diff] | |
| parent | 9bd03ece3c5a5da0f101c7551666bd6752202611 [diff] |
am 9bd03ece: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '9bd03ece3c5a5da0f101c7551666bd6752202611':