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

Change-Id: I01729af2bcf2d6692ebdcd6a9f02ed56b98508c0


Trivial merge