OSDN Git Service

Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am: 9df70249b9
authorDoris Ling <dling@google.com>
Thu, 29 Jun 2017 01:15:23 +0000 (01:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 01:15:23 +0000 (01:15 +0000)
commitbcd2322fa6c0e2be57289ec73ffe65ee3fcdaa36
treee92f3e9df690a19fcc6c2bbcac183fb4251262a8
parent2d6930b2dfcc6afeadd842e212f7c3e91dd2e074
parent5d66fa4c940c1837774863c90468a6eb14a09b84
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am: 9df70249b9
am: 5d66fa4c94  -s ours

Change-Id: Ic17a6314f3088e40a01f34bef67282696ec0bbbb