OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:29 +0000 (07:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:29 +0000 (07:23 -0700)
commit765f99f30fdc18396ce4edc9facbe6632c9b858e
tree201f10ac3d980c16aadf01b6a16e383e78f4f846
parent44ade05f8d030ae3af8d05359734b18eac433935
parent23126964b607dd7e65037fc8d9c6eda485be537f
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I87a7986866714bfd922259cf961d6d5f5b752362