tree e0cef4fb67b21f81d3b3edf691123861139a6a6d
parent 64f878e0a93ff4fde0e80ae6477491e6a76af05f
parent 527dd51029efb0186bbf41630b4faa26fbccaa01
author TreeHugger Robot <treehugger-gerrit@google.com> 1540893857 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1540893857 +0000

Merge "Add timeout for calling into role controller service."