tree 336c43dca2704643e71d7e3226852ffd8447adce
parent 98310f309710777eacb21c8549b1c6187a85b8fa
parent 9cbbb8b91d7642abd130af55f0b6b894ab707cac
author Colin Cross <ccross@android.com> 1530209290 -0700
committer Colin Cross <ccross@android.com> 1530209290 -0700

Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Emit errors on mixed property syntax

Test: m checkbuild
Change-Id: I3fccf8f0d4da80fd4cca79f14e860473a050c22a