tree 89ec9fd317b3354854b872bba129b5873ddacbe7
parent ef9718483bf2fe5024ee302152a9cfbd0f0a7d78
parent eaddde6888b1f58d70b338ad7725214781014324
author Elliott Hughes <enh@google.com> 1466029982 +0000
committer android-build-merger <android-build-merger@google.com> 1466029982 +0000

resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f
am: eaddde6888

Change-Id: I10d484d02389fa30cc8d8398bcf5b276de31432e