OSDN Git Service

am 27239099: Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)
commit82ac0ee5bcc9ab0edfdb95f8589848032a9b2a0b
tree9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6
parentf47588cbb7347b27fc790093c987e2e7d5366147
parent46dbb9b634c76ae338dcd8ed53322e87e7f1c777
am 27239099: Reconcile with ics-mr0-release

* commit '2723909903b68db016666a13ec897581a8915636':