OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:33:20 +0000 (09:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:33:20 +0000 (09:33 -0700)
Change-Id: Ia73ebcebfb83a21442a31dc7280763484e47534c


Trivial merge