OSDN Git Service

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


Trivial merge