tree 595e7d69108040a65d478069e0e082afa2eebbd9
parent d93de565ac84079f5774a13e61cd31b46b242575
parent e9e770ba71f8fb3f4a63b7efdbaa7d35adb299df
author Jean-Michel Trivi <jmtrivi@google.com> 1546039136 -0800
committer android-build-merger <android-build-merger@google.com> 1546039136 -0800

Merge "Fix element list in channel_configuration_14 description" am: 83e30f0f7b
am: e9e770ba71

Change-Id: Iff794b79659de4e4ce552b4ecb5c171b3f959faa