OSDN Git Service

Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 21:52:53 +0000 (14:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 21:52:54 +0000 (14:52 -0700)
commit115b146cc2dc4b4f9d43b4cd761727d233fc297c
treefc6ad753a7beab94b4a01a2f14a1754cb814c18d
parent8e1b4f65383d859ca7e2ebfc9a9463c8d46271de
parent46f961baabcfb3bd73ed5b4cf2ec7cf8e642ab1c
parent1f1d755ada0bc7d33c8c7226fe730d05d6a53acc
Reconcile with jb-mr0-release jb-release

Change-Id: I3742aff353335629ae76eacc2d92a6aed87b1ebe