tree 51afd9cac20678d1704e6a5f228ca7851f13613a
parent a64a73db7de14357bd42fce7d81b0086662f08ba
parent c431bdf57f998466b170b2a6baed0eea06d7100b
author Nick Kralevich <nnk@google.com> 1445991019 +0000
committer android-build-merger <android-build-merger@google.com> 1445991019 +0000

Merge "mediaserver: remove text relocation support"
am: c431bdf57f

* commit 'c431bdf57f998466b170b2a6baed0eea06d7100b':
  mediaserver: remove text relocation support