tree e528d96df8ee0f05d5e8ad9cf13799255d2ec905
parent 65ef6e8690cc13e9e20582fd0236b18eaae204b9
parent 29fa50be2484ed9d7a5e8075b764caa37b6494b9
author Teng-Hui Zhu <ztenghui@google.com> 1302211462 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302211462 -0700

am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master