OSDN Git Service

Merge "resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp" into honeycom...
authorRaphael <raphael@google.com>
Tue, 29 Mar 2011 20:07:51 +0000 (13:07 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 Mar 2011 20:07:51 +0000 (13:07 -0700)
commit9b9da008867252af03fa4585dd13e018939d3803
treef4dcbd5135a2e20c6182c54f00faa06805ab31e6
parent954cc580253a4b7f5b3a8c60457952f69eaa42ca
parentf578a0a487a76dfdb99d6d9eec4f3d43ea1552ec
Merge "resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp" into honeycomb-plus-aosp