OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:43:37 +0000 (07:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:43:37 +0000 (07:43 -0700)
commitc5ffd941710d24a59dd12608e3fc152510e70668
treef0aaa53a28e6e1bcf148974816f24fb33572c519
parentbd1c3a2112d023e9f0aab115c64ba345c666ebe5
parent92081e6efcc2981c444550b05ed5e5080dc04576
parent256d71560c83c6c222bb363b181c60c1fb083519
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I676e94de2cbbc9941fe4a895a55b2d5325babb88