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:58 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:22:58 +0000 (19:22 +0000)
am: 369cbd754c

Change-Id: I278e9d76f36c5b1eb543108c4491dd7720587207


Trivial merge