OSDN Git Service

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


Trivial merge