tree b73fa11e5379d49e2340565c8d4c55daec10e329
parent 147350473e6fbd3271f2d818519d7642b1cd0ef6
parent 49e1c134af19354a0f6d569e8f6ccef811143cc2
author Mathew Inwood <mathewi@google.com> 1534789241 -0700
committer android-build-merger <android-build-merger@google.com> 1534789241 -0700

resolve merge conflicts of 2382108d012e2200e7ed04668542ab15ca7be6b4 to stage-aosp-master
am: 49e1c134af

Change-Id: Ibe53538ff14d06275f0337b36a5c16160d31a8ff