OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:11:13 +0000 (19:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:11:13 +0000 (19:11 -0700)
Change-Id: I6e4530661a9c7119cc4082297def851f063112c7


Trivial merge