OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:53:09 +0000 (10:53 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:53:09 +0000 (10:53 -0700)
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa


Trivial merge