OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:54:36 +0000 (07:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:54:36 +0000 (07:54 -0700)
Change-Id: I24a1895c971a1774b19d7f0603e0b8260a20f230


Trivial merge