tree 6a2d9ebeccd88b80d7982de9def4a0833642241b
parent 1efc0f0c838534a0a0e4172fdd560473aa9e3363
parent 9d1c18ddd09dd3f3ad06284e6a16ab0b0cd6c7a4
author Haibo Huang <hhb@google.com> 1531333120 -0700
committer android-build-merger <android-build-merger@google.com> 1531333120 -0700

Merge "Remove dependency on std::tr1"
am: 9d1c18ddd0

Change-Id: I4fdb2586216d6ce5520bb47bf692a767d40c34a3