OSDN Git Service

am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
authorTeng-Hui Zhu <ztenghui@google.com>
Thu, 7 Apr 2011 21:24:22 +0000 (14:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Apr 2011 21:24:22 +0000 (14:24 -0700)
* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master


Trivial merge