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

Change-Id: I830a3885adef807f633eeb45742351eeaa307085


Trivial merge