tree 23938c0536e4dd53e10b951f015f1d6da0b650f5
parent d25479d1ed0a18420d9c011fcbdae5e210552e70
parent 0795213c781673a99ceeb63ea7d1d9c73934d3e2
author Colin Cross <ccross@android.com> 1475209468 +0000
committer android-build-merger <android-build-merger@google.com> 1475209468 +0000

Merge "Update escaping in Android.bp files" am: d655f577be
am: 0795213c78

Change-Id: I57bc0bac3df0b51d810fa204a7ff8b23361545d2