tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent decffc4e2fcb9da751eaee79200aee05684b144a
author Teng-Hui Zhu <ztenghui@google.com> 1302211072 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1302211072 -0700

Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* changes:
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master