OSDN Git Service

Merge "resolved conflicts for merge of 8550f3b8 to master"
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 15 Jul 2011 18:01:36 +0000 (11:01 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2011 18:01:36 +0000 (11:01 -0700)
commitfc5e367d80ed19f91b02d8a5615b4a3ac6c3f161
treeead50ae7df1de2dc4fd21c55a3912b72a32bce47
parente173b9d73bfe232303567a573ca25f2432d066d2
parentd9212d3088d2ecb794933c2f96392ea160b857eb
Merge "resolved conflicts for merge of 8550f3b8 to master"