tree e757172164fb43a787e0a3a863d18172637b865c
parent 9dacf2727c5919faea7cc103eeedfceceeff83b6
parent f23f074ed62808add3967ea4628929d8d7afd518
author Vignesh Venkatasubramanian <vigneshv@google.com> 1453344716 +0000
committer android-build-merger <android-build-merger@google.com> 1453344716 +0000

Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev am: 3990c54224 am: c356b493c1  -s ours am: 8b8df3b2c4 am: 07d12fe91b am: f8a626aacb  -s ours am: e88cc03449 am: 2b2e7fc957
am: f23f074ed6

* commit 'f23f074ed62808add3967ea4628929d8d7afd518':
  DO NOT MERGE - Remove deprecated image defines