OSDN Git Service

Merge "resolved conflicts for merge of 2af8a007 to master"
authorChung-yih Wang <cywang@google.com>
Mon, 13 Sep 2010 02:40:53 +0000 (19:40 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 13 Sep 2010 02:40:53 +0000 (19:40 -0700)
commit3443b9a0412159f8792902c804d976981318b178
tree29b7e63aaff8b3f6f2966ff5ecb56e821d624e52
parent2712fb5d7992c78425a4845ffb23853de30f3a2a
parent56f56a1f990bb4b687aa89e12b2d84d0017d1f48
Merge "resolved conflicts for merge of 2af8a007 to master"