tree b87a26ba9e4880dec461f0f87912fc3b405e2359
parent 1c1186618b0ab81a02b6c01881f837569165629a
parent dae4988a56af69e491d4674f00fbbd2af2048502
author Stephen Hines <srhines@google.com> 1532489519 -0700
committer android-build-merger <android-build-merger@google.com> 1532489519 -0700

[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" am: 9b18b764bc  -s ours am: 2abec98856  -s ours
am: dae4988a56  -s ours

Change-Id: I359147fb152042f803c373d26ed96ba79ca55904