OSDN Git Service

Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
authorTeng-Hui Zhu <ztenghui@google.com>
Thu, 7 Apr 2011 21:17:52 +0000 (14:17 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Apr 2011 21:17:52 +0000 (14:17 -0700)
commit8d314a934e519f9c73cac8681aab77fad12dd55d
tree2aa2cb6936c908494527967d2b865eaf6392b787
parentdecffc4e2fcb9da751eaee79200aee05684b144a
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