tree 0207af336cdc9a10648be5263036f36df859f79c
parent 027a1c0818da5ff5cd5e2a8ce853fd42df292c2e
parent 0dff05088ae967447745a7bad1f400eaad8ea60b
author Ryan Prichard <rprichard@google.com> 1548360489 -0800
committer android-build-merger <android-build-merger@google.com> 1548360489 -0800

Merge "Reassign TLS slot 2 to TLS_SLOT_APP." am: 3ce06c7b0a am: e74ab5e8a4
am: 0dff05088a

Change-Id: Iddd81e7187ed18ea45a35cd5c29fec5f7a6fb0f2