OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 19:33:43 +0000 (12:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 19:33:43 +0000 (12:33 -0700)
commit0ab04716dcb05f085edcc80bbed3ecefcbec9c46
tree83142f38ac6b7c6276570b0ed344440c26ed61c5
parent1b8e21aa2d4a48c3c0777929e723817995881f70
parent01ad343cdfa28eb3b2b47115bca4b07d366915bc
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I645db66e377a7f385129f72507f19036d4029445