OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:25:50 +0000 (13:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:25:50 +0000 (13:25 -0700)
Change-Id: I577fb5bc77b6df44adec589f76d0c2aecdd8eba0


Trivial merge