DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: ce25f76fbb -s ours...
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:28:20 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:28:20 +0000 (19:28 +0000)
am: 31d9b9c4b8  -s ours

Change-Id: I3b3690214bfd2388ac536c17c7adc8f07187b1bb


Trivial merge