tree bd15ffbab9069d71be4a9ed2187d128c06eb5636
parent 996c40906e39cffb23e0317d2e10a7cf61a1bfb5
parent 7c12cd3ae4662b744e074fc01416a87747ff5bf2
author Dongwon Kang <dwkang@google.com> 1460664837 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460664838 +0000

Merge "TIF: Add Programs.COLUMN_RECORDING_PROHIBITED" into nyc-dev