tree 36eea1acb348bc85ab20d9374eb488a3996a5438
parent 54eac255b9fb5d87b15d65f2727b85db11bd21b9
parent 0e61b46673ac3e01492132060b1fab35a73e57d5
author Benoit Lamarche <benoitlamarche@google.com> 1481022718 +0000
committer android-build-merger <android-build-merger@google.com> 1481022718 +0000

resolve merge conflicts of e04c941 to stage-aosp-master
am: 0e61b46673

Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb