tree 2c7a6da0b462552d70c0eb63ed58bb0c4e81e0bb
parent 325b14418fcc9d54da9dcdcf616f5458178054f2
parent b978acee1eaefc6667fa874e74db5c6456ed6c77
author Haibo Huang <hhb@google.com> 1547255611 -0800
committer android-build-merger <android-build-merger@google.com> 1547255611 -0800

Merge remote-tracking branch 'aosp/upstream-master' into arm-optimized-routines am: 4ced35fcfc am: 6bdf91e070
am: b978acee1e

Change-Id: I4a74c2421a0a26c5ca92f80e53edbb2487764897