OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:39 +0000 (07:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:39 +0000 (07:52 -0700)
Change-Id: Ic84ef2f21e05ef7e9606e0f9defc7865d248c59d


Trivial merge