summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-06-031-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-273-26/+76
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-202-1/+75
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-171-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Add ability to disable auto-resize of text for resizing text view." in...TreeHugger Robot2018-03-291-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add ability to disable auto-resize of text for resizing text view.Tyler Gunn2018-03-281-2/+11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-2882-656/+656
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | / Finalize STK call control stringsJordan Liu2018-03-211-8/+8
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 6fa6375943 -s oursBill Yi2018-03-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2018-03-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-011-1/+1
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-011-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "packages/apps/PhoneCommon: Set LOCAL_SDK_VERSION where possible." am: ...hansson2018-02-231-0/+1
|\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "packages/apps/PhoneCommon: Set LOCAL_SDK_VERSION where possible." am: ...hansson2018-02-231-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "packages/apps/PhoneCommon: Set LOCAL_SDK_VERSION where possible."hansson2018-02-231-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "packages/apps/PhoneCommon: Set LOCAL_SDK_VERSION where possible."hansson2018-02-231-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | packages/apps/PhoneCommon: Set LOCAL_SDK_VERSION where possible.Anton Hansson2018-02-221-0/+1
| | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | / Import translations. DO NOT MERGE am: 95ec0b067b -s oursBill Yi2018-01-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-01-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-01-242-5/+5
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-01-183-3/+13
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-01-102-2/+7
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-12-1279-3/+398
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "IMS: Add support for STK CC feature" am: 5d4a1f6332 am: e93692546bJordan Liu2017-12-081-0/+10
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "IMS: Add support for STK CC feature" am: 5d4a1f6332Jordan Liu2017-12-081-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "IMS: Add support for STK CC feature"Jordan Liu2017-12-081-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "IMS: Add support for STK CC feature"Jordan Liu2017-12-081-0/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | IMS: Add support for STK CC featureSuresh Koleti2017-10-051-0/+10
* | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 9aaa10cf7f -s ours am: ...Xin Li2017-12-080-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 9aaa10cf7f -s oursXin Li2017-12-070-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li2017-12-070-0/+0
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li2017-12-061-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | Manually merge changes from giant AOSP topicStephen Li2017-12-070-0/+0
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | DO NOT MERGE: Merge Oreo MR1 into master am: 3e7af59fe3 -s oursXin Li2017-12-070-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-061-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | / Import translations. DO NOT MERGE am: beda3253a4 -s oursBill Yi2017-11-300-0/+0
|\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-11-300-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-11-291-1/+1
* | | | | | | | | | | | | | | | Migrate PhoneCommon to aapt2Aurimas Liutikas2017-11-151-0/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-150-0/+0
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-140-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge commit '380cc52239e0b07a653f4a7d51111d1bac6e6500' into HEADXin Li2017-11-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 61825b76ec -s ours am: 0a522badf8 -s ...Bill Yi2017-10-200-0/+0
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Import translations. DO NOT MERGE am: 61825b76ec -s oursBill Yi2017-10-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-10-200-0/+0
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-10-206-10/+10
* | | | | | | | | | | | | Import translations. DO NOT MERGE am: 56200caf0e -s ours am: 5203d2485c -s ...Bill Yi2017-10-170-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Import translations. DO NOT MERGE am: 56200caf0e -s oursBill Yi2017-10-170-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-10-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |