OSDN Git Service

am bc874c49: (-s ours) am bf7db314: test_vendor_lib: Read controller properties from...
authorDennis Cheng <dennischeng@google.com>
Thu, 27 Aug 2015 10:55:41 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:41 +0000 (10:55 +0000)
* commit 'bc874c497e0720aba004e96e9c0dd3076954abb8':


Trivial merge