Commit b2e9d3d4 authored by Nicole Borrelli's avatar Nicole Borrelli Committed by android-build-merger
Browse files

Merge "Simplify some of the logic." into oc-dev am: d8b56216 am: 41ce3730 am: 660851ca 

am: ba827d0e

Change-Id: I19720f73ecb037fdebc84a8d9168b93482a729de
parents bd448134 ba827d0e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment