OSDN Git Service

Merge "resolved conflicts for merge of 2f2882a0 to master"
authorJean-Baptiste Queru <jbq@google.com>
Mon, 26 Sep 2011 20:24:33 +0000 (13:24 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 26 Sep 2011 20:24:33 +0000 (13:24 -0700)

Trivial merge