am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev

* commit '231a81282a9ac8fcfb4f42c5819181c78e3b133d':
This commit is contained in:
Matthew Xie
2014-10-27 18:52:12 +00:00
committed by Android Git Automerger

Diff Content Not Available