OSDN Git Service

Merge "Fix merge conflict for 'c506ab89'" into honeycomb-plus-aosp
authorDan Morrill <morrildl@google.com>
Thu, 13 Jan 2011 20:21:07 +0000 (12:21 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Jan 2011 20:21:07 +0000 (12:21 -0800)
commitf85c337dadeabb2fed138de1764c19676d325162
tree0f1364799787600afd95940bf753064f5b927da8
parent70a7cec0c41613182b3e4477eee87d8cf413bf8a
parentb34b504affaef9a372cae9a6dc13a37347073bdc
Merge "Fix merge conflict for 'c506ab89'" into honeycomb-plus-aosp