Merge "DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: ce25f76fbb...
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:28:37 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:28:37 +0000 (19:28 +0000)
am: 524cbbfc09  -s ours

Change-Id: I2f3a886b4ab8a120a5b22b78b84072f8b5fb63b8


Trivial merge