commit | d0ec3286e7d2d2d0fa6643d8d59c956cd46decb1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 08 14:14:13 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 14:14:13 2013 -0700 |
tree | 88670f6823e78f2744704d23d799da90428a647c | |
parent | c618d4f1008991ec6fe3d89adb83091e6d7cef73 [diff] | |
parent | f66a269fa4300fa691348bdd55a2a16ff55de608 [diff] |
am f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge * commit 'f66a269fa4300fa691348bdd55a2a16ff55de608': JWR66W JSS15O JLS36 JSS15N "JSS15M" "JSS15L" "JSS15K"