tree 6a2d9ebeccd88b80d7982de9def4a0833642241b
parent efa4661f26291ebc8253525f381fbaf7b3082e5d
parent 7209da4601ac70bf53476144e6e4e77f1e3cda82
author Haibo Huang <hhb@google.com> 1531333362 -0700
committer android-build-merger <android-build-merger@google.com> 1531333362 -0700

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

Change-Id: I1ec96b9d37ddf375e4ec6d0b633a5b96b086b08d