tree c79198534b8a622c5c087537a735deee156b8ad0
parent 22d09743d875d8a2fdf6c6ddf99bc371bfc899dd
parent 0cb33aefacb87f4e0f992a471164c734c4b05585
author Matthew Fritze <mfritze@google.com> 1469063063 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1469063065 +0000

Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev