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:26 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:17:26 +0000 (19:17 +0000)
am: 741d866132

Change-Id: Ie0d84faeddc08977385d79395517dd0783dd5f69


Trivial merge