OSDN Git Service

Merge "Fix crash in plugin settings" into oc-dev
authorJason Monk <jmonk@google.com>
Tue, 25 Apr 2017 17:03:59 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 17:03:59 +0000 (17:03 +0000)
am: 133eb460bd

Change-Id: I60b8fb3a05b46fef7375dd9dddafc5137f0624b0


Trivial merge