OSDN Git Service

Merge "resolved conflicts for merge of d90712d0 to master"
authorJustin Koh <justinkoh@google.com>
Tue, 22 Apr 2014 18:30:09 +0000 (18:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 22 Apr 2014 18:30:10 +0000 (18:30 +0000)

Trivial merge