| commit | 8319d0cee736614551339954e2e94946d50b6419 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 08 16:12:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 16:12:47 2013 -0700 |
| tree | 88670f6823e78f2744704d23d799da90428a647c | |
| parent | 253e7127e97fde1ef78fad423ebd73497def94c9 [diff] | |
| parent | d0ec3286e7d2d2d0fa6643d8d59c956cd46decb1 [diff] |
am d0ec3286: (-s ours) am f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge * commit 'd0ec3286e7d2d2d0fa6643d8d59c956cd46decb1':