| commit | 691f4b8fa5ccd67f90fa9e9db3347d75c45085a3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:25:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 08:25:39 2013 -0700 |
| tree | d3ec5099fe44a26f7125e56b576a18b42e5f1353 | |
| parent | bc602b675fad6684ec372f1a0e46a0adeefad550 [diff] | |
| parent | 4c68067199343b781015502dfe9af313680d2e98 [diff] |
am 4c680671: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '4c68067199343b781015502dfe9af313680d2e98':