tree 40be29e9647175d6e6cebc598906f8852b2baace
parent 8e0f45274ddae19089241c959d12b72a6f699560
parent 7c6e5ac421e23cd7846f5236f6f8dfd931f3db98
author Johan Toras Halseth <johanth@google.com> 1491489594 +0000
committer android-build-merger <android-build-merger@google.com> 1491489594 +0000

Merge "Change flag from -includekeyvalue to -keyvalue/-nokeyvalue" into oc-dev am: 3cc32f2aa2
am: 7c6e5ac421

Change-Id: Ic9a99ccbec6895ce540776577e3c5613b31981ca