tree df0afc43fe036a62d1e21af5db79d369cba87702
parent df5e1470aa254adf0ef1eda28264ff217574fea8
parent 06ee4bad988ea240b8df0b3afd5281cbe43494dd
author Android Build Merger (Role) <android-build-merger@google.com> 1461707784 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461707786 +0000

Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am: cac018b am: 9e16ddc am: 461e731" into nyc-dev