OSDN Git Service

am 1ca1730b: Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:51:28 +0000 (15:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Nov 2011 23:51:28 +0000 (15:51 -0800)
* commit '1ca1730b88e45d39c9211793d133cae148b134a1':
  ICL49


Trivial merge