OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:05:51 +0000 (09:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:05:51 +0000 (09:05 -0700)
commit48f280cf257c8cc27ffef1758dca8834c61fe14a
treec2e98ffe144c5f5169864118b245b5353fe21cd5
parentb11ab8578b997a5d2bfc93b13c1c71396c60a03f
parent366e37636fabda87ec2a0fb9b72f27fe3ca81b0a
Reconcile with jb-mr1-release - do not merge

Change-Id: I02113763b6c6dfd96cf69377e244412d647a54f4