OSDN Git Service

am 1f2a5665: (-s ours) am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regressio...
authorNick Kralevich <nnk@google.com>
Thu, 27 Aug 2015 08:47:38 +0000 (08:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 08:47:38 +0000 (08:47 +0000)
* commit '1f2a56659faea64d2b417a17c6842726e44e4a85':


Trivial merge