OSDN Git Service

Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycom...
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 11 Mar 2011 22:16:18 +0000 (14:16 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Mar 2011 22:16:18 +0000 (14:16 -0800)

Trivial merge