OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:35 +0000 (07:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:35 +0000 (07:41 -0700)
Change-Id: Iad38196cfc19e957bee42dad0dda94f9b9402328


Trivial merge