OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5


Trivial merge