DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:05:13 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:05:13 +0000 (19:05 +0000)
commitca8c87afa7033d99ca5ae3ba2f8c6e4d49858195
tree938ebed25ddb9f88dd1b4251c35baf83de927ffc
parentd9829199edcbe0ba4131575f04218d3c028d3249
parentce25f76fbb8fed76c371211d57e976a0132f42e8
DO NOT MERGE: Sparse resources fixes am: ae793c389b  -s ours
am: ce25f76fbb  -s ours

Change-Id: I33de2b1ee388029e360a84df04b75265289d2f70