tree 1865b9cd012b622ebc4370f94d164e8136aea0f0
parent ba827d0e354333ecf4ba712313af7f08bd4da321
parent 2a25b379e14a845027cc8cfe40007d241ca88e0a
author Nicole Borrelli <borrelli@google.com> 1508365866 +0000
committer android-build-merger <android-build-merger@google.com> 1508365866 +0000

Merge "Simplify some of the logic." into oc-dev am: d8b5621640 am: 41ce373022
am: 2a25b379e1

Change-Id: I8e77acd699be2624724477717718e55d947e2362