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


Trivial merge