OSDN Git Service

Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycom...
authorIrfan Sheriff <isheriff@google.com>
Thu, 3 Feb 2011 00:03:29 +0000 (16:03 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Feb 2011 00:03:29 +0000 (16:03 -0800)
commit9b21e21661028b5870323d066b1dab243a42022b
tree430d43287f74d55354acf42adcb209c4744542bc
parentd7a3ebe031daa250e9987760aeee0384649a9c01
parentc8f4b619dd3bfa814cf8e7a8303f5089267f9ce1
Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp