OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:42:15 +0000 (07:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:42:15 +0000 (07:42 -0700)
Change-Id: Icaf1734bf56551758a818c0b3bbbda7a7eda0924


Trivial merge