refs/heads/master-cuttlefish-testing-release - platform/packages/inputmethods/OpenWnn

commit: 7525835dc606501b19084c6fd09b2774317b60df
[log]
author: Colin Cross <ccross@android.com>
Mon May 14 15:59:04 2018 -0700
committer: android-build-merger <android-build-merger@google.com>
Mon May 14 15:59:04 2018 -0700
tree: cc883d2a63667f110156421769ef71c7363cbf43
parent: cd782d7f7010bde1a1fdfbfd9acb3fb746754929 [diff]
parent: 7792a13c96b78642b48b27dab38817c59c423be6 [diff]

Merge "Fix errors caught by aapt2" am: 953fc3b4e7
am: 7792a13c96

Change-Id: I59775ba0c95d2093d34434e4c9fcc427cb43f779

tree: cc883d2a63667f110156421769ef71c7363cbf43