OSDN Git Service

Merge "Experimental features only on debuggable builds." into oc-dev am: d9f6946c42
authorJeff Sharkey <jsharkey@google.com>
Sat, 29 Apr 2017 19:12:39 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 19:12:39 +0000 (19:12 +0000)
am: 8e19424e6f

Change-Id: Ia4a2dc323116ae44bb906d77ba4809845247c65d


Trivial merge