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)

Trivial merge