tree 4173695c429d9c462e2642c26b74a0b3b0e1db3d
parent c549c7e7b41cedaacfe77fb22de20291b5664d1e
parent 1382d8d50eecf88e687f0d32db1b43648665c817
author Beverly <beverlyt@google.com> 1529509908 -0700
committer android-build-merger <android-build-merger@google.com> 1529509908 -0700

resolve merge conflicts
am: 1382d8d50e

Change-Id: I959a997d7ad57755421f90ee89cc2d7ba3cc7f0a