tree 2aee113cf883821e88eda193b7ee9f63bf920175
parent b1193dd15c509918f4d59c5ce43a23ff1a16e5c3
parent 0080349d2959921a232e73cbde77da7929a3b836
author Colin Cross <ccross@android.com> 1525721637 -0700
committer android-build-merger <android-build-merger@google.com> 1525721637 -0700

Merge "Migrate TeleService to aapt2."
am: 0080349d29

Change-Id: I150266db1a171f3d12a8f9ee419bf1756f39e3e4