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

Change-Id: I6576b1b8462ec583c9aa14c6de7c37cab3ee70ff


Trivial merge