summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platf...staging/cm-12.1-testSteve Kondik2015-03-25135-4014/+3080
|\
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-290-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-270-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-260-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-210-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-200-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-150-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-120-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-080-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-310-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-230-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * Revert "Allow back to be pressed while in incoming call screen"Yorke Lee2014-12-171-0/+7
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-110-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Removing "windowNoTitle" style attribute for InCallScreen.Tyler Gunn2014-12-091-1/+0
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-080-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-040-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Add some more logging in InCallActivity and InCallPresenterYorke Lee2014-12-022-1/+2
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-270-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-240-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-200-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-190-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-180-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * Removed unused VideoCallFragmentYorke Lee2014-11-172-14/+0
| | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ccbb7447ec8d4c3895f365d6c33d3...The Android Automerger2014-11-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |/|/
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 3e9579c63e16472804c69dd36ce53...The Android Automerger2014-11-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 2eb54ad88714924ba76b4232c286b...The Android Automerger2014-11-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8c24233d5532c5576091c4097cd4c...The Android Automerger2014-11-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a6329a13cfb2d390548a5818d323e...The Android Automerger2014-11-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a6329a13cfb2d390548a5818d323e...The Android Automerger2014-11-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a6329a13cfb2d390548a5818d323e...The Android Automerger2014-11-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to db2663f9aad98e2de3f5d9d4986a9...The Android Automerger2014-10-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to db2663f9aad98e2de3f5d9d4986a9...The Android Automerger2014-10-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 34b852b543d4e9c71c4efccc07359...The Android Automerger2014-10-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 34b852b543d4e9c71c4efccc07359...The Android Automerger2014-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 34b852b543d4e9c71c4efccc07359...The Android Automerger2014-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 34b852b543d4e9c71c4efccc07359...The Android Automerger2014-10-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c21e69b7b574bba0c7c8aec5a1252...The Android Automerger2014-10-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c21e69b7b574bba0c7c8aec5a1252...The Android Automerger2014-10-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 133d6e32c4e1ae3748b8529a3e23a...The Android Automerger2014-10-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c3defe5b62cab2f17fe58b3b6e55c...The Android Automerger2014-10-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c3defe5b62cab2f17fe58b3b6e55c...The Android Automerger2014-10-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|