tree b87a26ba9e4880dec461f0f87912fc3b405e2359
parent 3d4fb41f3d6719a03a9a931267f7e14637dee922
parent 9b18b764bc34c0ad53b08eb3f3ed02e0e50c3c51
author Stephen Hines <srhines@google.com> 1532489109 -0700
committer android-build-merger <android-build-merger@google.com> 1532489109 -0700

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

Change-Id: I15fbe10ff91d910478dd67c93fbd9bff8f3fee36