am 631dd2ea
: am 231a8128
: am 68f3653e
: am 72c34e6a
: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '631dd2ea58bbb1729b169ec66dfefa1cd3dcbdd6':
This commit is contained in: