OSDN Git Service

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


Trivial merge