OSDN Git Service

reovle conflicts for cc089099
authorshared_user android-merger-prebuild <android-merger@google.com>
Tue, 18 Jan 2011 16:21:32 +0000 (08:21 -0800)
committershared_user android-merger-prebuild <android-merger@google.com>
Tue, 18 Jan 2011 16:21:32 +0000 (08:21 -0800)
Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b


Trivial merge