Commit a6b1d730 authored by Lei Yu's avatar Lei Yu Committed by android-build-merger
Browse files

[automerger skipped] Merge "Add active admin app to power white list." into pi-dev am: a14e1b39 

am: 1e6fc486  -s ours

Change-Id: Ic3a6fb846ae7fb496a6dc246d72749f29d6cf5de
parents 20a65c4e 1e6fc486
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