tree 1a9d09dc1e99d4e8d9bd093edf38e63b0c53530d
parent 15e5f9d476f174ef6e506ae39d483f539ed04b8a
parent d6a3bafd12977acc282017fbaa3d06a03a8906c4
author Colin Cross <ccross@android.com> 1526348146 -0700
committer android-build-merger <android-build-merger@google.com> 1526348146 -0700

[automerger skipped] Merge "Fix errors caught by aapt2" am: 5d58a302e3 am: 2743c5bb09
am: d6a3bafd12  -s ours

Change-Id: I7a9419213d418d64ca8eec262a9db46cdfa73ab4