[automerger skipped] Merge "Allow android::base::ScopeGuard in STL containers" into pi-dev

Browse Source

am: 64250b5abe  -s ours

Change-Id: I224a160667f7c5a8a61b5640a902ebbf65560dd7

...

This commit is contained in:

Luis Hector Chavez 2018-03-27 02:43:22 +00:00 committed by android-build-merger

parent bbf2cb3976 64250b5abe

commit 2edb005875

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available