tree d36a3e4493208e137ce94a6a8b05f888861dd646
parent 4809d2ed1f0d8fc6123b6fe77e1edefe31826a2b
parent 5dadd0e08aeda0d8a4d55b66e08f31a3828d967d
author Colin Cross <ccross@android.com> 1525384854 -0700
committer android-build-merger <android-build-merger@google.com> 1525384854 -0700

[automerger skipped] Merge matching properties in bpfix
am: 5dadd0e08a  -s ours

Change-Id: I5f732915c7754a97f9745a1d4ec0a1b5ba0700b6