OSDN Git Service

Merge "resolved conflicts for merge of ec52c98d to master"
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 9 Sep 2010 20:37:42 +0000 (13:37 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 9 Sep 2010 20:37:42 +0000 (13:37 -0700)
commit0e8525fb8740d1590ea30df726c051fab9f7c221
tree0b7f731f5693986570f066b620df843c4aaac816
parente60e5c7a07aad8bedab43c1096b01a871248df91
parentcd45cacffadb8beced55c6ac59d4e810159f92b7
Merge "resolved conflicts for merge of ec52c98d to master"