OSDN Git Service

am 17c01198: am 31b0c687: Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 10:37:17 +0000 (02:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Nov 2011 10:37:17 +0000 (02:37 -0800)
* commit '17c011985e53e7513c13bc1ed40aa65222dc660a':


Trivial merge