OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:57:48 +0000 (09:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:57:48 +0000 (09:57 -0700)
Change-Id: I140c6ef68bdb8fa5a2e4d1041405ba9f3c85097a


Trivial merge