tree 3e3e9e6ab9830012ffe92b9e71edeea476a6d576
parent 17b172ac7b330dd87a624fb6622f739a5afde091
parent 974cbd9cc5f47c572f135945a74e13c3a88c740d
author Scott Wakeling <scott.wakeling@linaro.org> 1485530302 +0000
committer android-build-merger <android-build-merger@google.com> 1485530302 +0000

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

Change-Id: Id4f7df50b98e7a37f85adeb26c9b3187fdcea5fb