OSDN Git Service

Merge "Add a feature flag for CTS." into oc-dev
authorSam Lin <samlin@google.com>
Wed, 5 Apr 2017 01:37:26 +0000 (01:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 01:37:26 +0000 (01:37 +0000)
am: 9ff3ec4872

Change-Id: I1b2e8026cf2db083fb17ab03d0e1972addffdbbb


Trivial merge