OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:40 +0000 (10:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:40 +0000 (10:49 -0700)
Change-Id: Ia8c3c7215b620c1cf453cd01fa8420d50061f879


Trivial merge