OSDN Git Service

Merge "Add a no-op activity to handle development setting intent." into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 12 May 2017 20:16:19 +0000 (20:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 May 2017 20:16:20 +0000 (20:16 +0000)

Trivial merge