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:52 +0000 (07:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:54:52 +0000 (07:54 -0700)
Change-Id: I9619964e59d6d3f9036372e67278498472f1d290


Trivial merge