OSDN Git Service

Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev
authorFan Zhang <zhfan@google.com>
Tue, 25 Jul 2017 23:11:13 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 23:11:13 +0000 (23:11 +0000)
am: 7da06bd11b

Change-Id: Ieb1fb873537f8faca68b185e0f219e7bd4031524


Trivial merge