tree 522f777b0dee03f95beb844c44d4acfcb9e52dc2
parent db1632fadc79df388a2a7248157c965ee40248a1
parent 4f8bfeae470950ef005327973f15b0044eceaceb
author Martijn Coenen <maco@google.com> 1479197370 +0100
committer Martijn Coenen <maco@google.com> 1479215653 +0100

Merge remote-tracking branch 'aosp/upstream-master' into upstream_merge

Test: builds, ran bionic benchmark (b/32895959 for discrepancies)
Change-Id: I2adb0a3c84d469e4f1aeb6b411b18a37f5782d98