OSDN Git Service

am a201914b: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 23:52:24 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jan 2012 23:52:24 +0000 (15:52 -0800)
commit7f442558d163cae1fda57104cbc8ed35a88c8fff
tree56c7848d1ee483ddb1302ae7e6aea46652f0025d
parent7c73e8951d91b5afe9d52f88d7ed3a09d120a725
parenta201914b3b2f6910b4ce4d58a4f170d9ebaeb174
am a201914b: Reconcile with ics-mr1-release

* commit 'a201914b3b2f6910b4ce4d58a4f170d9ebaeb174':