Skip to content
Commit ed3fd6ba authored by Colin Cross's avatar Colin Cross
Browse files

Merge remote-tracking branch 'aosp/upstream' 

* aosp/upstream:
  Emit errors on mixed property syntax

Test: m checkbuild
Change-Id: I3fccf8f0d4da80fd4cca79f14e860473a050c22a
parents 98310f30 9cbbb8b9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment