tree e757172164fb43a787e0a3a863d18172637b865c
parent 0b4938eae8102c5c4c81fc90c4518ef0f1ef33fd
parent 1c2e80f9c4a462e8f8a59eaf393ffd8906cd92a0
author Vignesh Venkatasubramanian <vigneshv@google.com> 1453345236 +0000
committer android-build-merger <android-build-merger@google.com> 1453345236 +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
am: 1c2e80f9c4

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