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


Trivial merge