[automerger] DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: 3312e52...
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:11:12 +0000 (19:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:11:12 +0000 (19:11 +0000)
am: ff821babbb

Change-Id: If221543708d549addc0eb4a2930b4c6cc5636ce3


Trivial merge