commit | 3bcd9f393828e43c5576e969ed4579968f8d9370 | [log] [tgz] |
---|---|---|
author | Sudhir Sharma <sudhshar@codeaurora.org> | Mon Mar 16 14:30:38 2015 -0700 |
committer | Sudhir Sharma <sudhshar@codeaurora.org> | Mon Mar 16 14:30:38 2015 -0700 |
tree | e85c9dd43884fae8811a5b1e1c7de1190215f82c | |
parent | 8b49117201eec1a50a50cc64599dea6a13701383 [diff] | |
parent | e7523f5100bea61d531eadc78128390574eb15d9 [diff] |
Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045' into HEAD AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045 based on quic/aosp/LA.BF64.1.2.1 * tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045': IMS: IMS Registration error codes support IMS: Fix crash when participant leaves from conference. IMS: Propagate the call session handover info to the UI Conflicts: src/java/com/android/ims/ImsCall.java Change-Id: If0cc76339353247070017c1bf8271bab6a3831a2