OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:48 +0000 (07:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:48 +0000 (07:14 -0700)
commitd472db6d8e5b2e7365e86fe78b7d1d2ac90d9e34
tree483c273415ec73e086b7f554364223e4288d4245
parent9ac559b58c49a43ed9468422feef0ae500340efe
parent101670cfa2286de9784d3a81a1a1bee507ca5e8f
Reconcile with jb-mr2-release - do not merge

Change-Id: I31a3e1b1185ded041c4b1dea06da4f2cd87fe21d