OSDN Git Service

Merge "Fix errors caught by aapt2" am: 5d58a302e3
authorColin Cross <ccross@android.com>
Tue, 15 May 2018 01:03:55 +0000 (18:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 May 2018 01:03:55 +0000 (18:03 -0700)
commitd6a3bafd12977acc282017fbaa3d06a03a8906c4
tree2ced2f72d126deb77478f5c207c2ee309d5f5d13
parentf68e5665bf8728342685bd8ea843d4bda03cfde3
parent2743c5bb09b7b6a39ab4debff316f8953e51eb01
Merge "Fix errors caught by aapt2" am: 5d58a302e3
am: 2743c5bb09

Change-Id: I84dbf6e0fbfe8e2730ffa3fa79c3ef732702e192