OSDN Git Service

am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device...
authorMatthew Xie <mattx@google.com>
Mon, 27 Oct 2014 18:52:12 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:52:12 +0000 (18:52 +0000)
commit631dd2ea58bbb1729b169ec66dfefa1cd3dcbdd6
treec6ef5d273c98188de9e990c14b470c0e0f02f70c
parent0c32b376b81328de2c60c2cfcc6cd7e81dfdb4e0
parent231a81282a9ac8fcfb4f42c5819181c78e3b133d
am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev

* commit '231a81282a9ac8fcfb4f42c5819181c78e3b133d':