summaryrefslogtreecommitdiffstats
path: root/mockril
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-10 17:04:17 -0700
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-18 01:15:20 +0200
commit3c6f6bef4084052463c8665cfdc340e5cdf46162 (patch)
tree38731495f8b5495c7f3669efb721a70828f1239b /mockril
parent949aeb6d16adcc45453bbb8a76a1eb105641ebde (diff)
downloadframeworks_opt_telephony-master.zip
frameworks_opt_telephony-master.tar.gz
frameworks_opt_telephony-master.tar.bz2
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.HEADmaster
And make stk commands protected. Bug: 21697171 Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b Conflicts: src/java/com/android/internal/telephony/cat/CatService.java
Diffstat (limited to 'mockril')
0 files changed, 0 insertions, 0 deletions