OSDN Git Service

Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
authorIrfan Sheriff <isheriff@google.com>
Wed, 22 Jun 2011 14:27:39 +0000 (07:27 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Jun 2011 14:27:39 +0000 (07:27 -0700)
commit5d5b73be515d839d72e1cf7aeffdfdfb56d66045
tree41d8ccbcf4723f3c6cd25dbd92f5bf446df0d36e
parent4d9261fad3e3bdfa056f377c10f2af0a6db62542
parentc74eacde3028551864d8a9f8822803a835785c3a
Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE