OSDN Git Service

Reconcile with jb-mr0-release jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 27 Aug 2012 21:11:17 +0000 (14:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 27 Aug 2012 21:11:17 +0000 (14:11 -0700)
Change-Id: I0387880d7a374b53a5d0f58c7c2234a4ae3cf325


Trivial merge