am 0b60012d: am 24fe8315: 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 '0b60012d':
Allow authority to be set from build configuration - DO NOT MERGE