tree f21eab1684353bf91c9eed8377a23065461e7b73
parent 6ae5c7c7d5d9ccf0975e148b5364971a1fe24aa4
parent a5055070563297852c8fbf5e7cf23ca92b7a3bb1
author Greg Hackmann <ghackmann@google.com> 1481127967 +0000
committer android-build-merger <android-build-merger@google.com> 1481127967 +0000

Merge "Add test for ambient caps" am: 51366e9b16
am: a505507056

Change-Id: I37bba965ae49f97708df4ddc6eb3041883449124