| commit | 115b9c3755b01e4f80d9d10542c0b88f8f661bfa | [log] [tgz] |
|---|---|---|
| author | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:51:13 2016 +0530 |
| committer | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:51:13 2016 +0530 |
| tree | 678d978b6ed01f0efcd722e08098bf3b9619ad04 | |
| parent | 03ebc3fed807757491a9dbe9de615307b41ebd75 [diff] | |
| parent | 9bdcff7bdf72dd69f43c2b3d6fc20474130008c0 [diff] |
Merge commit '9bdcff7bdf72dd69f43c2b3d6fc20474130008c0' into remote Conflicts: AndroidManifest.xml InCallUI/src/com/android/incallui/Call.java InCallUI/src/com/android/incallui/CallButtonPresenter.java InCallUI/src/com/android/incallui/NotificationBroadcastReceiver.java InCallUI/src/com/android/incallui/StatusBarNotifier.java InCallUI/src/com/android/incallui/VideoCallPresenter.java Change-Id: Ice78377f619bcd740170eff4393102329319f43d