OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:37:37 +0000 (10:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:37:37 +0000 (10:37 -0700)
Change-Id: I935b9694f3885d28f3d3af62459a91fb354ad6f2


Trivial merge