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)
Change-Id: I87a7986866714bfd922259cf961d6d5f5b752362


Trivial merge