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

Change-Id: I8330f16b10a9fa7074a218fc1b84f14924725288


Trivial merge