OSDN Git Service

Merge "Fix NPE"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 26 Oct 2017 02:36:46 +0000 (02:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 26 Oct 2017 02:36:46 +0000 (02:36 +0000)

Trivial merge