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

Change-Id: Ia222290093f68021534f2517420a6a4df6f42a84


Trivial merge