OSDN Git Service

Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp...
authorWink Saville <wink@google.com>
Fri, 19 Aug 2011 16:28:34 +0000 (09:28 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Aug 2011 16:28:34 +0000 (09:28 -0700)
commit43c15339886bf6c6fb87527d86525da58542e790
treea17cabb0d4508c3ffb541a7b8ba4705222b2f26b
parentcfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef
parentcd34366886d7db3dbb1661bcbdaf9fa6eea20005
Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp