commit | a4ee3088e74bb9b38dcd469df4dc929f1c935ff3 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 12 07:27:43 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 12 07:27:43 2013 -0700 |
tree | de9803fe3c9f00c9702da69f84a1bca1aedfaa15 | |
parent | 9c8685b714b38c2bbf09077b9cba73a95b734269 [diff] | |
parent | 2248ff32bac6bdc0500ed963c8a5e7c96e6873c0 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f