OSDN Git Service

Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into ginger...
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 4 Apr 2011 18:23:51 +0000 (11:23 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Apr 2011 18:23:51 +0000 (11:23 -0700)
commit37229514c56dac0c1e3cef6bc8229232d0c75b96
tree67f0666dce75aacb210db8c93402662f90a0f5d5
parent27e00544ea08d25e8e9b1b94264205f9d53030fb
parentd685c731bf8116f42b980dc31fc7cf29e6ce1fc4
Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp