tree e27b4933194b4872d6825dfa30bdc7f055377574
parent 2fb2b42e67ed82e4da50b2b68de4c109591e0ffd
parent 24d81001677743c3ebffe32a2a48c7036974d1fb
author Dan Willemsen <dwillemsen@google.com> 1452732198 -0800
committer Dan Willemsen <dwillemsen@google.com> 1452732198 -0800

Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  docs: Allow propery structs to contain non-struct ptrs
  Catch panics in build logic
  Colorize errors