tree 36caea25e52b7eb589adadee447207dc2e6dc56d
parent c98eb7545593bd34edfd6dcd040cedbd3696d0e1
parent c40af334c7f2e76c3a34824a17ea3803caedbd7d
author Tom Cherry <tomcherry@google.com> 1491518719 +0000
committer android-build-merger <android-build-merger@google.com> 1491518719 +0000

Merge "Move scopeguard into android::base"
am: c40af334c7

Change-Id: I4f507f5c2304b0ea00cadcb0693207e0a3c95180