tree c077f9ad7dc59323aa2ac0e01fdc948d17411e30
parent dd6a433163f814a5ac08f05535113d763f2b941e
parent 1737e50fa162a282a94e5c8bac0186c0038b3543
author Jeff Sharkey <jsharkey@google.com> 1493401864 +0000
committer android-build-merger <android-build-merger@google.com> 1493401864 +0000

Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev am: 4315c1e3d5
am: 1737e50fa1

Change-Id: I92766efee7b312e9dd09bc7fcac42850f457a5e9