OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:19:05 +0000 (09:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:19:05 +0000 (09:19 -0700)
commit10b8e684e1945edfb60ec4391ac4c7f3d8bf4172
tree0ffa5ba512ec22b2af06a69524d0bf089b3074ae
parent29e55ef83def8eaf6aa01201c6344a8037b2f780
parent1cbe0ce40c523de48911fec2a94aec34e8ab14a3
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic3c4a57147bc3a4154c140beeeed27b5e3be9ece