Google Git
Sign in
android / platform / packages / services / Telephony / 65e0be10aeba7078b04fb43943049f92e3aeafaf
commit65e0be10aeba7078b04fb43943049f92e3aeafaf[log] [tgz]
authorTyler Gunn <[email protected]>Tue Jun 05 16:40:04 2018 +0000
committerAndroid (Google) Code Review <[email protected]>Tue Jun 05 16:40:04 2018 +0000
treea495fdbd4f0468e207c1553a62aec42e2a50b336
parent1900f810b95d2f2901cacf04b886081d4347e44c [diff]
parentdd12cfe45e9d52525a80a04b9c234feece5430e6 [diff]
Merge changes from topic "am-538bf8fd-0fa8-4c10-aeea-2cd19adfb09f" into oc-dev

* changes:
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb am: e89a641900 am: ee4c0fedba skipped: 03900d8e80
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb am: e89a641900 am: ee4c0fedba
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb am: e89a641900
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56 am: 91971125eb
  [automerger] DO NOT MERGE Revise security requirements for TelephonyManager#endCall. am: 5ae9c95f56
  DO NOT MERGE Revise security requirements for TelephonyManager#endCall.
tree: a495fdbd4f0468e207c1553a62aec42e2a50b336
  1. assets/
  2. res/
  3. sip/
  4. src/
  5. tests/
  6. Android.mk
  7. AndroidManifest.xml
  8. CleanSpec.mk
  9. lint.xml
  10. MODULE_LICENSE_APACHE2
  11. NOTICE
  12. proguard.flags