Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am: 9df70249b9

am: 5d66fa4c94  -s ours

Change-Id: Ic17a6314f3088e40a01f34bef67282696ec0bbbb
This commit is contained in:
Doris Ling
2017-06-29 01:15:23 +00:00
committed by android-build-merger

Diff Content Not Available