| commit | 32dbac87fd02b7a747f04bc9fa19eddc5e2cdb92 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:26:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 07:26:00 2013 -0700 |
| tree | d3fe460f067c6a275d7031f50d1efa3cc62a8aa2 | |
| parent | fc1f308ca1d679f9e9823a848e6396a23513f2fb [diff] | |
| parent | cd9482d961d1c14b6dea7279f8524e29908b6a27 [diff] |
am cd9482d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'cd9482d961d1c14b6dea7279f8524e29908b6a27':