DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: ce25f76fbb -s ours
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:10:51 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:10:51 +0000 (19:10 +0000)
commit5fe3fbe2161b4e2324ebb8bf8c9caae21b229450
tree15705e6d9d21345088c78ea4160da489beb1bb6c
parentf35ed9f82cce18f210e5dcca5939ec94727386ad
parentca8c87afa7033d99ca5ae3ba2f8c6e4d49858195
DO NOT MERGE: Sparse resources fixes am: ae793c389b  -s ours am: ce25f76fbb  -s ours
am: ca8c87afa7

Change-Id: Ib7913848676c54821d744f8a8a06e1d645aad494