summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/main/impl
AgeCommit message (Collapse)Author
2017-06-22Merge "Manually integrate upstream oc-dr1-dev changes."TreeHugger Robot
2017-06-22Manually integrate upstream oc-dr1-dev changes.Eric Erfanian
https://googleplex-android-review.git.corp.google.com/#/c/2446830/ Test: TH, make Change-Id: I39aba7e972bac6e5864e70ed693849d90ecd7e08
2017-06-21Automated g4 rollback of changelist 158923709.wangqi
*** Reason for rollback *** It's not necessary anymore after we verified it could be controlled from server side. *** Original change description *** Flip flag to enable ReturnToCall bubble. Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions. *** Also in the change: Restore TODOs Test: TH PiperOrigin-RevId: 159587541 Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b
2017-06-19Update AOSP Dialer source from internal google3 repository atEric Erfanian
cl/159428781. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/152373142 (4/06/2017) to cl/159428781 (6/19/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030