OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:27:45 +0000 (08:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:27:45 +0000 (08:27 -0700)
commit443acd482323a84119d39102e1ccbb08ce6c01a1
tree483225aa0dd123a84bf5f2219a3bf93d104e19d0
parent92ec9e947bc3aee7d152ffb78112d12514001490
parentc8ed5a88861df775e336df0db4169353bdaf2c14
Reconcile with jb-mr1-release - do not merge

Change-Id: I5aeced4f5a3183ec2acf09356d43087857da634b