| commit | 1c3e160bfeb9ddde3fe4e3e5f40ff156f011d2e5 | [log] [tgz] |
|---|---|---|
| author | Ricardo Cerqueira <ricardo@cyngn.com> | Thu Nov 05 04:43:19 2015 +0000 |
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | Thu Nov 05 14:12:31 2015 +0000 |
| tree | 482483d1d05a5289ce58f47827e490895de607a4 | |
| parent | cc1bd10c8a40fa1d037c1e11fc4adc0779d3c9fe [diff] | |
| parent | a20d5b05c8e6b9b810fa6113e5e59177d6cc58bc [diff] |
Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 Conflicts: src/com/android/server/telecom/BluetoothPhoneServiceImpl.java src/com/android/server/telecom/CallIntentProcessor.java src/com/android/server/telecom/CallsManager.java src/com/android/server/telecom/components/UserCallIntentProcessor.java Change-Id: I6282a22460bddf72fe1cd4b178d797c5f82f652e