| commit | e88401953eee20160ef8076bc034a6510096062d | [log] [tgz] |
|---|---|---|
| author | Jerry Zhang <zhangjerry@google.com> | Tue Apr 04 19:37:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 04 19:37:00 2017 +0000 |
| tree | 06dc648e7172356814fe91804c3d08d5b77f845b | |
| parent | 05d698d9500891bab7f2468568da1fdb54715101 [diff] | |
| parent | f97ade32426843025260275767a2d6dae17c9fc1 [diff] |
Merge "Add timeout to lock in MtpServer configure" into oc-dev am: f97ade3242 Change-Id: Ib6f2cd6072826b3d25f0304760023ec2ab0eef75