tree 563b63f8cc445fc2740fe4b6df62160a7ac74ce9
parent d77f7c26c2eff9353c2c42a2b695e73107eb871a
parent dc9fdadbd2c01530f8afae8a9ff385151a05340a
author Dan Albert <danalbert@google.com> 1475015611 +0000
committer android-build-merger <android-build-merger@google.com> 1475015611 +0000

Merge "Migrate tts.h to ndk_headers." am: 567db48790
am: dc9fdadbd2

Change-Id: Id7be76aa57b2a49ed2f3286f93c8f7c907fd7b15