OSDN Git Service

Merge \"Error colors to point to frameworks rather than hard-code them\" into nyc...
authorMatthew Fritze <mfritze@google.com>
Wed, 20 Jul 2016 23:47:23 +0000 (23:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 23:47:23 +0000 (23:47 +0000)
am: 948400a43d

Change-Id: Ibeca72659bbd13b1a5a8bdb009fc6a5021f8acbf


Trivial merge