commit | c5ffd941710d24a59dd12608e3fc152510e70668 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:43:37 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:43:37 2013 -0700 |
tree | f0aaa53a28e6e1bcf148974816f24fb33572c519 | |
parent | bd1c3a2112d023e9f0aab115c64ba345c666ebe5 [diff] | |
parent | 92081e6efcc2981c444550b05ed5e5080dc04576 [diff] | |
parent | 256d71560c83c6c222bb363b181c60c1fb083519 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I676e94de2cbbc9941fe4a895a55b2d5325babb88