OSDN Git Service

am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
authorMatthew Xie <mattx@google.com>
Fri, 19 Sep 2014 00:31:59 +0000 (00:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 00:31:59 +0000 (00:31 +0000)
* commit '72c34e6a956a54ed023d207b41f5d21365b15c38':
  Do not overwrite alias with device name


Trivial merge