OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 22:03:38 +0000 (15:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 22:03:38 +0000 (15:03 -0700)
Change-Id: I539f46011cbad0084b0fbb9dba6bb553ee370851


Trivial merge