tree 01540e0ca828b40bd4de7267e5cb8a5d07ff71c6
parent 7e454bd098434338fa6da8d4a8164762d3abed0f
parent 83e30f0f7b8ceea2c4bd6912d60df2a19cc8c74d
author Jean-Michel Trivi <jmtrivi@google.com> 1546038735 -0800
committer android-build-merger <android-build-merger@google.com> 1546038735 -0800

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

Change-Id: Ifb41f345377985c17a23847a218193cfc09708ea