tree 371d91135fa3a10ab44cd033b53ba67a90eb1c4c
parent 926cd28257536b1206934d69585a2dab100147d5
parent 793b4d910a7ece1d21f8c5b48b805b3e513507a9
author Chris Banes <chrisbanes@google.com> 1459961313 +0000
committer android-build-merger <android-build-merger@google.com> 1459961313 +0000

Merge "Back out TintResources changes DO NOT MERGE ANYWHERE" into mnc-ub-dev
am: 793b4d9  -s ours

* commit '793b4d910a7ece1d21f8c5b48b805b3e513507a9':
  Back out TintResources changes DO NOT MERGE ANYWHERE

Change-Id: I252ff7a3da143c40cce817b6be93d992f6713776