tree 6dfe11b734c0f5009e2d556c68379c82b141f9dc
parent 9aeef94b8e62746d796a54ad4da8f52a11384762
parent c997d66018b65ec60eb25b3b0a8a58b42da9be1e
author Andreas Gampe <agampe@google.com> 1528843331 -0700
committer android-build-merger <android-build-merger@google.com> 1528843331 -0700

[automerger skipped] Merge "Frameworks: Remove complex boolean" am: 16eef1aad8  -s ours
am: c997d66018  -s ours

Change-Id: Ic3087510597891dfa5c4fe09573f2de3c8391947