OSDN Git Service

Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
authorXia Wang <xiaw@google.com>
Thu, 10 Mar 2011 23:29:12 +0000 (15:29 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 10 Mar 2011 23:29:12 +0000 (15:29 -0800)
commitcf994cc57df33121cea7a0082c8ea55ca125279c
treea2ca2d19bf0a68c851e55244c22d019f5112f56b
parenta7118e33b494b26bfbd37c895a1c412cd5da56ec
parent4bc5c4a1f5ea529ef7c7b38ee3782c8f209f7b9c
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1