tree ce8c30675952bc3062d80973addd9ceb4d1d6966
parent f327bff73f87159896162e223fa4dd15edce364a
parent 5675d28df750d636d053a65db6abfcf72f4cf4ee
author Jaekyun Seok <jaekyun@google.com> 1485329005 +0000
committer android-build-merger <android-build-merger@google.com> 1485329005 +0000

Merge "Prevent abuse of property overrides" am: 7ae18449ec am: c96ffae29f
am: 5675d28df7

Change-Id: I716b89ef4b1b2fef99725b170ea5be0c09822374