OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:09 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:09 +0000 (16:43 -0700)
Change-Id: Ic6ae8074b669ad14dbebbe935e01dda773c3a58c


Trivial merge