tree 94f5468d2060d86b2ec2da256006a49778437ce9
parent acfcc160b06ffd3c49b6403fc3f68865e090179b
parent 7bdec85d2027032533d6fd9e55827cb9cb738b87
author Artem Serov <artem.serov@linaro.org> 1484228338 +0000
committer android-build-merger <android-build-merger@google.com> 1484228338 +0000

Merge remote-tracking branch 'aosp/upstream-master' into master am: f822f577a8 am: e3a79de276 am: 751f025227
am: 7bdec85d20

Change-Id: Ic2138a14251b92b52c9037f1d1d3bedf8be71da4