Merge "Fix copy / move behaviour of Maps object."
am: 30c898f1ca

Change-Id: I7912a4c29393b7e0fb0e1e26c09160989f8544f2
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: 7e345a00a13d5a431d58332dac67aa90e2f392e1
1 file changed