tree 3e3e9e6ab9830012ffe92b9e71edeea476a6d576
parent 7bdec85d2027032533d6fd9e55827cb9cb738b87
parent 1340a67e99f4a164656b77fff164496c8bb48ef8
author Scott Wakeling <scott.wakeling@linaro.org> 1485530205 +0000
committer android-build-merger <android-build-merger@google.com> 1485530205 +0000

Merge remote-tracking branch 'aosp/upstream-master' into master am: d66a6515d5 am: 1eb82cc7c1
am: 1340a67e99

Change-Id: I6fcb2aa04c5118c7bdc70c5e2332c8738137f873