OSDN Git Service

merge (-s ours) history of HRI06B
authorandroid-merger <android-merger@google.com>
Fri, 7 Jan 2011 23:38:09 +0000 (15:38 -0800)
committerandroid-merger <android-merger@google.com>
Fri, 7 Jan 2011 23:38:09 +0000 (15:38 -0800)

Trivial merge