[automerger] DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: 3312e52...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 9 Feb 2018 19:05:25 +0000 (19:05 +0000)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 9 Feb 2018 19:05:25 +0000 (19:05 +0000)
Change-Id: I711e13c5393bd4e4b13f6ecb9e7311c904c9e1cd


Trivial merge