| commit | 5e1e791f3aaf6661ff4a21fe5b00f264057e862d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 13 10:11:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 10:11:58 2013 -0700 |
| tree | f4a2baa04ef59804af24f9697c6c30a8ef37a7d9 | |
| parent | ad7fd29b312bf588b2be3f799715f34ff8a6d46b [diff] | |
| parent | 5aac97cbfcb3f638805311ffe733e5bf6dc29747 [diff] |
am 5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge * commit '5aac97cbfcb3f638805311ffe733e5bf6dc29747': "JLS36B" JWR66X JSS15P