OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:44:31 +0000 (07:44 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:44:31 +0000 (07:44 -0800)
commit43afd557f8b4b87561321135cf284b14e87c2bc6
tree9d54b94b6a9b0fcfb456ae05e21953e8ea97d9f0
parent36d4f8f2a5929d181deccb73332372b0a412bea6
parent434e86339ecbcc93c85617f760661c765199e118
Reconcile with ics-mr1-release

Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903