tree 5bf831af2a60b626d7eafa10b5f177ce3e245c71
parent 64bc4f01e6d9890f56ac7f103bda0666a8713d14
parent 3c9c11746af0f6d8f3abf30d3f32c9b0f3a342fe
author Nicolas Geoffray <ngeoffray@google.com> 1505897123 +0100
committer Nicolas Geoffray <ngeoffray@google.com> 1505897123 +0100

resolve merge conflicts of 3c9c117 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie87035926bc9ab1590a8c1635cab12e028ad0953