tree a70235945948deff0968ff1af50a810795685572
parent d9f2c306eff08ddb4aebe29c902e05e973f89376
parent f673358b06e09b27cf2e546947a20af043222475
author Makoto Onuki <omakoto@google.com> 1533315393 -0700
committer android-build-merger <android-build-merger@google.com> 1533315393 -0700

resolve merge conflicts of c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master am: 088849fc5e
am: f673358b06

Change-Id: I31d8689302a010cedfeada7d7cf2bf66fac7b50f