commit | 94d7dba7f2fd513d52367a01deca9788953e43d3 | [log] [tgz] |
---|---|---|
author | Julia Reynolds <juliacr@google.com> | Thu Apr 13 17:12:16 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 17:12:16 2017 +0000 |
tree | 69aa8a159a8e88e5c5d95a1a157b3bf24057f41f | |
parent | 8d90496b1395662235a3b88e5a528fa1cfb8fae4 [diff] | |
parent | a98a3444fb03ef4b3cac064d7946f8dcaf482a46 [diff] |
Merge "Companion device mgr doesn't always exist" into oc-dev am: 3d6225b4e2 am: a98a3444fb Change-Id: I4d540fadf69842a45fc86f08f8fc3f10cab5a0c7