OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:17 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:17 +0000 (08:05 -0700)
Change-Id: I385ce51e37f3116c03d7de78036f4ed7ad883641


Trivial merge