OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:28:39 +0000 (08:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:28:39 +0000 (08:28 -0700)
Change-Id: I8c04d0993640dd9ad32dc8a383266b28ab0c5494


Trivial merge