OSDN Git Service

resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp
authorRaphael <raphael@google.com>
Tue, 29 Mar 2011 19:53:33 +0000 (12:53 -0700)
committerRaphael <raphael@google.com>
Tue, 29 Mar 2011 19:53:33 +0000 (12:53 -0700)
commitf578a0a487a76dfdb99d6d9eec4f3d43ea1552ec
treed6aa8a91168f9d921150b37cf985488155c21ce8
parent53d2a9a1acd2182a525401f3c1a82faff178a9d8
parent8c2d872a02fec027d5bc76758cdf58db728478d7
resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp

Change-Id: Ied7d5ccb947094ea7f3334ee052eed39ee315a48