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)
commit36be4eaa5e83e59987370134bef241fa0011c8e6
treed6d7b496c4187b44f7696098f078841c3a85dfae
parent626af3404f055c5cb7e1da14d8f4e54becbe9d63
parent524cbbfc0912345cc4b2988824a9cb024bae46bf
Merge "DO NOT MERGE: Sparse resources fixes am: ae793c389b  -s ours am: ce25f76fbb  -s ours am: ca8c87afa7 am: 5fe3fbe216 am: 369cbd754c" into oc-mr1-dev-plus-aosp
am: 524cbbfc09  -s ours

Change-Id: I2f3a886b4ab8a120a5b22b78b84072f8b5fb63b8