| commit | f4b87380530d687a1c707cec919b008ebf94600f | [log] [tgz] |
|---|---|---|
| author | Shreyas Narayan <shrena@codeaurora.org> | Sun Mar 15 03:15:13 2015 +0530 |
| committer | Shreyas Narayan <shrena@codeaurora.org> | Sun Mar 15 03:15:13 2015 +0530 |
| tree | 2a9eff51714e29691647f4c328ee0419e90f15ee | |
| parent | 547aa6627b979064c6625e422fb666a157db6e16 [diff] | |
| parent | 7102168c47250da01ccabde9c40ca4e6ce62484b [diff] |
Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.01.00.066.050' into HEAD AU_LINUX_ANDROID_LA.BF64.1.2.1.05.01.00.066.050 based on quic/aosp/LA.BF64.1.2.1 Conflicts: src/com/android/incallui/AnswerPresenter.java Change-Id: Ib245ec7cf476f9d238daa8c954dd8575cd7df87b