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)
commitd395d372c1a55b5dfd982a81eea852d23905d810
treeaab456746a87080f3777cd2506e94fae18f43931
parent367798e84a7b482c8188e7f9cb298e8988cd2e3d
parentfce2201da045464728fc6269c1f428b2e4400c85
Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp