tree c9a4ed77bfc9c2d5b677ffb4943e657b215e04e1
parent e88cc034497e4f61a0d205a8273f03e082507e6f
parent 7ecec2f57c271e5aa1128ee6728d68d9016a88cc
author Vignesh Venkatasubramanian <vigneshv@google.com> 1453344715 +0000
committer android-build-merger <android-build-merger@google.com> 1453344715 +0000

DO NOT MERGE - Remove deprecated image defines am: c73b811066 am: 87ca2397c4  -s ours am: 1e258cd044 am: 865145f085  -s ours am: 68976ead50 am: b8cd2a261a
am: 7ecec2f57c  -s ours

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