| commit | b2765e7d9a2f4c8a755649b81eca4876448f9962 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 11:11:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 10 11:11:55 2013 -0700 |
| tree | 1ee94607e5383d0fb010060305e93bf75b543c47 | |
| parent | 3606254a507d838dbec0da35f88c432e6eef7643 [diff] | |
| parent | b72a2204113804855d4e64c8e8f5f1d1598c7f50 [diff] |
am b72a2204: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'b72a2204113804855d4e64c8e8f5f1d1598c7f50':