diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-17 16:52:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-17 16:52:28 +0000 |
| commit | 0d1362b28afb4a71b8b2a56bad2be3fcf2802de6 (patch) | |
| tree | 91fb2d0f5c065f024a7332ec664c794cdf30f413 /java/com/android/incallui/ProximitySensor.java | |
| parent | 5a6cb962ae30ad9e308b5bcc00920daf84618808 (diff) | |
| parent | c114cce52656e6ace2ffdfd075b0e8cd140cd498 (diff) | |
Merge changes I84ec0ac5,I2b92e1e0,Ic30fa6c6
* changes:
Move Duo related constants out of interface
Dismissing location prompt now actually prevents it from reshowing.
Add GSM conference calling to simulator.
Diffstat (limited to 'java/com/android/incallui/ProximitySensor.java')
0 files changed, 0 insertions, 0 deletions