OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:36:39 +0000 (10:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:36:39 +0000 (10:36 -0700)
commit3f9c18ed225decec4e73325d561feea310546796
treec025ef3387aeb0b44c895c965a1312de6ced05a6
parentc6ab8e66459865a87efd9a99091439c7496d4cd1
parentd93115936def8a60533711529e3893f1b5cc7a9c
Reconcile with jb-mr1-release - do not merge

Change-Id: I264ae21c4a260cdf4e4f08d1ced7cae3cdc0a7ab