[automerger] DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: 3312e52...
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:11:12 +0000 (19:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:11:12 +0000 (19:11 +0000)
commita688957dacd5e5d8e204e0b9beeeda3efd6b56e1
tree15705e6d9d21345088c78ea4160da489beb1bb6c
parent5fe3fbe2161b4e2324ebb8bf8c9caae21b229450
parentff821babbbbd5e6834de2abf7bd29fcae2690970
[automerger] DO NOT MERGE: Sparse resources fixes am: ae793c389b  -s ours am: 3312e52e89 am: 8b8d087f0b skipped: f96f9107c3
am: ff821babbb

Change-Id: If221543708d549addc0eb4a2930b4c6cc5636ce3