OSDN Git Service

Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycom...
authorKenny Root <kroot@google.com>
Thu, 19 May 2011 19:48:41 +0000 (12:48 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 19 May 2011 19:48:41 +0000 (12:48 -0700)
commitf9fa770f389c0c710bf16fc38f52f6f36ad73793
tree384bd709bfdad1b99e928efef531b47d16a3d8f3
parent2a88c9e89105f9a4daf3cef752c2b390db66694e
parent77123ca5529d2b7f27c665ea75df3463e813b0ca
Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp