| commit | cdd398b03aefc79028d7286e8b4feabb3b6eae3e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:58:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 21 11:58:23 2013 -0700 |
| tree | 8e56629d2d87b17c93e170d5059da540552ff099 | |
| parent | 64d592129e4f5231f61ac2b6055e1b37f8c0ebb6 [diff] | |
| parent | f05e2d25372a47f5ff3b2d0c122d5ca8c3786238 [diff] |
am f05e2d25: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'f05e2d25372a47f5ff3b2d0c122d5ca8c3786238':