tree a0fa805d0f3084519d2fb8b1c5766d50c419752b
parent b8c7ef5eaf24eb747edf308d4946569a61ee52d9
parent c61d1366ffa1cd3e4766956b507cbe01910108dc
author Yorke Lee <yorkelee@google.com> 1443216570 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1443216570 +0000

Merge "Add permission annotations to TelecomManager"