commit | 07c68e644ad862969978b86e45ddf3f648e32da8 | [log] [tgz] |
---|---|---|
author | Martijn Coenen <maco@google.com> | Thu Aug 27 05:06:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:06:55 2015 +0000 |
tree | 9d4820a3e765b60ef9ce75e94cc2c016e00485f8 | |
parent | 66b265e45f6d71bbd1c52f3bede82e1952ef507e [diff] | |
parent | bd53a1c0372cdf7deeb07e5146492f1cf4919e19 [diff] |
am bd53a1c0: (-s ours) am 54aa01ca: Merge "Fix conflict vendor proprietary Protocol and Discovery technology definitions" * commit 'bd53a1c0372cdf7deeb07e5146492f1cf4919e19':