summaryrefslogtreecommitdiff
path: root/telephony/java/com/android/ims/ImsConfig.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2017-08-29 11:32:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-29 11:32:07 +0000
commit54f40fa1e6bdd27e10738d09e1a123ca8c99f412 (patch)
tree7d0feed0d6daa16b402ba69a07b12d2527468b93 /telephony/java/com/android/ims/ImsConfig.java
parent55309e79cff3b3a34c16bf034981a1f3143f1733 (diff)
parent791ccc00aae7647d146646e4c8ec0d5e2f5bd4ed (diff)
Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
* changes: Fix transition between two occluding activities Use Keyguard orientation when unoccluding
Diffstat (limited to 'telephony/java/com/android/ims/ImsConfig.java')
0 files changed, 0 insertions, 0 deletions