OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:48 +0000 (07:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:48 +0000 (07:14 -0700)
Change-Id: I31a3e1b1185ded041c4b1dea06da4f2cd87fe21d


Trivial merge