| commit | fb0c7c703c51cb279265db879d4d1b922997868d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 12:02:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 21 12:02:15 2013 -0700 |
| tree | 0a3389eec82ac36d852902f5cb809606258e45f9 | |
| parent | ef2cfa7ad398a6b00a831434eb522f8e037c9594 [diff] | |
| parent | 11f5f98482e8cf1f237488aef6fef5cea8f9a900 [diff] |
am 11f5f984: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '11f5f98482e8cf1f237488aef6fef5cea8f9a900':