tree 6446fdfd35230a7bd1987c3681f0f6b09751d380
parent f837358fc46c2e680e44b8b12d03bdecf98a642c
parent 190f3369d593d387f5d1ac07d35a9486bbfc52cd
author Teng-Hui Zhu <ztenghui@google.com> 1302211623 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302211623 -0700

am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit '4e790ee1894118a1ab2032d09e5016fa9414dae7':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master