OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:37:24 +0000 (08:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:37:24 +0000 (08:37 -0800)
Change-Id: I3381ba02649abcb559115d5bf1e508ca1f361a66


Trivial merge