OSDN Git Service

Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
authorBrian Carlstrom <bdc@google.com>
Thu, 28 Mar 2013 00:11:20 +0000 (00:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Mar 2013 00:11:20 +0000 (00:11 +0000)

Trivial merge