[automerger] DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: 3312e52...
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:28:55 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:28:55 +0000 (19:28 +0000)
am: 2ba11fde51  -s ours

Change-Id: Ie1b7fa9e46b8532c5b6245171362097a6f145344


Trivial merge