tree 5e69d9c84be614ae8479a9d3b604a4f77cd0fea8
parent 81f7d06a5ea33c7be3e6a885cf4707aa10a89e1b
parent c284379659f26bd129a524ba134a97329165b5de
author Hall Liu <hallliu@google.com> 1488330358 +0000
committer android-build-merger <android-build-merger@google.com> 1488330358 +0000

Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377
am: c284379659

Change-Id: I892dd9f7c070aade5962b53277a860a55ed237ea