| commit | cea25ea4e04f6ec27c9eb085bd40fcbc33db0dac | [log] [tgz] |
|---|---|---|
| author | Sudhir Sharma <sudhshar@codeaurora.org> | Thu Mar 12 20:00:32 2015 -0700 |
| committer | Sudhir Sharma <sudhshar@codeaurora.org> | Thu Mar 12 22:43:12 2015 -0700 |
| tree | 8a8c74aeb888ed9633d52a16d99ea399c14f974c | |
| parent | 66313bc74f279831e0cbaa0ce15d24085c7d74e6 [diff] | |
| parent | e8dc8490b430c7f26d19f3ebea2ae8d011fb2e23 [diff] |
Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into HEAD "AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002" Conflicts: src/com/android/services/telephony/ImsConference.java src/com/android/services/telephony/ImsConferenceController.java src/com/android/services/telephony/TelephonyConference.java src/com/android/services/telephony/TelephonyConnection.java Change-Id: I71fc1eab31b562c8d3397dbff61e5968b2713f78