tree fc76ca92195b513f37be16215d1249e9ba651dea
parent 6601decd2dd92d9cb4e69499cbd57dae0925f3c7
parent 4bac3b0e8f564d14d602ddf5d5fa1beb84f06999
author Colin Cross <ccross@android.com> 1511902865 +0000
committer android-build-merger <android-build-merger@google.com> 1511902865 +0000

Merge remote-tracking branch 'aosp/upstream' into match am: 9b145212c9
am: 4bac3b0e8f

Change-Id: Ie6ce13fc562510cb2cfc929bc9f04d3b0ff4a9a1