tree 101fe69ca41b63b29d5c5f7fcc2e19db96b64411
parent 56691784b8b6cd0ccd7ef7119585c9ade0db2307
parent 7c65d9f23d70ed443a3dc6ce4977a06c85ca8fc9
author Chalard Jean <jchalard@google.com> 1526976099 -0700
committer android-build-merger <android-build-merger@google.com> 1526976099 -0700

Merge "Fix setCapabilities." into pi-dev
am: 7c65d9f23d

Change-Id: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1