am 3563c180: (-s ours) am fdf72f91: (-s ours) Merge "Allow authority to be set...
am 3563c180: (-s ours) am fdf72f91: (-s ours) Merge "Allow authority to be set from build configuration - DO NOT MERGE" into ub-deskclock-army
* commit '3563c180':
Allow authority to be set from build configuration - DO NOT MERGE