tree 4128d617d6bd2468852518947bfc5ed1666c6db8
parent f947a122cb4844b94f09a413d4cb7110a5f32553
parent 8228eb34462cc9f76152bc87e20e721cd0e20775
author Lorenzo Colitti <lorenzo@google.com> 1500421077 +0000
committer android-build-merger <android-build-merger@google.com> 1500421077 +0000

resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master
am: 8228eb3446

Change-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72