| commit | f795dd4498d1f604555b9d769444dc4c9a419dc9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 08 06:36:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 06:36:54 2013 -0700 |
| tree | 37618f86d005da35e1cb780550fa5588a2c700bd | |
| parent | 89fa610033dd26a7eeef91a0f4df1e92428726e6 [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"