OSDN Git Service

Merge "Fix compile issues in Settings."
authorTomasz Mikolajewski <mtomasz@google.com>
Fri, 30 Sep 2016 00:39:53 +0000 (00:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 30 Sep 2016 00:39:53 +0000 (00:39 +0000)

Trivial merge