aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d626e07492 -s ↵Bill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: dd70db430a -s ours am: 935ce8d1b8 -s ours Change-Id: If272bae040e6afa237df7b63826a671adec93604
| * | | | Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d626e07492 -s ↵Bill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: dd70db430a -s ours Change-Id: I0fa7cacb1558577d831d7d34bfc17bd00db348b0
| | * | | Merge "Import translations. DO NOT MERGE" into oc-dr1-devBill Yi2017-12-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: d626e07492 -s ours Change-Id: I44e62e4825b52be0ec277f1b77421cd4997bb2f9
| | | * | Merge "Import translations. DO NOT MERGE" into oc-dr1-devTreeHugger Robot2017-12-201-15/+15
| | | |\ \
| | | | * | Import translations. DO NOT MERGEBill Yi2017-12-191-15/+15
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9cd6184f5b9a65b84a46d2bb271b536237fa8f44
* | | | | Import translations. DO NOT MERGE am: 7f39ff785e -s ours am: 7659c56784 -s ↵Bill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: bfe9042d64 -s ours Change-Id: Id95bf59c810de26ed42d0f7d5663bc31683b0694
| * | | | Import translations. DO NOT MERGE am: 7f39ff785e -s oursBill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7659c56784 -s ours Change-Id: I6c3ce912214abdd2cdb37bad8429113e63e5ef10
| | * | | Import translations. DO NOT MERGEBill Yi2017-12-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f39ff785e -s ours Change-Id: I91b2fc3c61e368f28e48dd3108fedd399d1e7d49
| | | * | Import translations. DO NOT MERGEBill Yi2017-12-193-5/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: If8517d5669dde19ce47805286ebdf9a330960892
* | | | Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ce7d21ad2e -s ↵Bill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: ab6d16cf88 -s ours Change-Id: I37165f937a36f6a96227733d7581a212befa2507
| * | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: ce7d21ad2e -s ours Change-Id: Ifeebbb62fc19818763a60e3a74301f48a04d5816
| | * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-12-203-5/+5
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-12-193-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I62e324677b8c212ff4b94ccfa46102a8971ad39e
* | | | | Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: da3b9b9752 -s ↵Bill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 71dabe0eed -s ours Change-Id: I30964a88d1d143b0558f9dde6a05a8ad1cb14c30
| * | | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: da3b9b9752 -s ours Change-Id: I4fc8311aaf02b2555def8b7550bd17a5b4e18cd9
| | * | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-12-201-15/+15
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2017-12-191-15/+15
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I23df49c7d77697a168da5c2d1201078582349eab
* | | | | Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 0149f480f6 -s ↵Bill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b5ea28b58a -s ours Change-Id: Idd470a77aa63ed039e169da8a187ccaa5f456148
| * | | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0149f480f6 -s ours Change-Id: I4171b39c31b76b84300d9802706102170003ed0f
| | * | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-12-201-2/+2
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2017-12-191-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I118125d24857d4aae99800775c0456ee94c56676
* | | | | Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 82f6b2d105 -s ↵Bill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 0eb4382f34 -s ours Change-Id: Ia6988c7363abd01a4bd289074640e22f0759a6d5
| * | | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 82f6b2d105 -s ours Change-Id: I63ce80697d5d44f5ea67a43d4438ede095fd9971
| | * | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-12-203-3/+3
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2017-12-193-3/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I4c5f3c11ba98c1ee0dc4ad110ddf8f92eb13ac75
* | | | | Import translations. DO NOT MERGE am: 5b4b6457d9 -s oursBill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6b7423b2a0 -s ours Change-Id: Ic7d5b7a2f30755adceddaadd80638e508fc41b03
| * | | | Import translations. DO NOT MERGEBill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5b4b6457d9 -s ours Change-Id: I05eafbac66243bae4a2f9af4616777df2891dd95
| | * | | Import translations. DO NOT MERGEBill Yi2017-12-195-11/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I69f3689d113dbb5fdc5bf4b5fe538d24c2aeeb0a
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-202-4/+4
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-12-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I47cd7bc7be3a009b204ecd509b98577d5a07ee38 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-202-3/+3
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2017-12-192-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I265c7babd1e0f3d6ed7dc9ddf7779f770520cca5 Auto-generated-cl: translation import
* / / / / Import translations. DO NOT MERGEBill Yi2017-12-191-15/+15
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Id98113aaa443c1107240b4002a35a8d9e1ea129b Auto-generated-cl: translation import
* | | | Add android.test.base/stubs dependencyPaul Duffin2017-12-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for the removal of the non-junit classes in the android.test.base library from the android.jar this adds a dependency on android.test.base/stubs to ensure this code will continue to compile. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because LatinIMETests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. Bug: 30188076 Test: make dist Change-Id: I9f2244d4b5711620dc02dd24dc407807d726480e
* | | | Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126 am: 88f12fdcceColin Cross2017-12-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: d373b6c4a5 -s ours Change-Id: I86e0ae275098b662783ca97b9a73bbcd80cac611
| * | | Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126Colin Cross2017-12-131-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 88f12fdcce Change-Id: I4ffe046c3b332cd065ba5735f23e19b8d067ac6b
| | * \ \ Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"Colin Cross2017-12-131-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 87c6fcf126 Change-Id: Iaf8222d9bde062ebd6a75a610961b518a2fd65ca
| | | * \ \ Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"Colin Cross2017-12-121-1/+1
| | | |\ \ \
| | | | * | | Use a.t.mock.stubs instead of a.t.mock.sdkPaul Duffin2017-12-071-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependencies on android.test.mock.sdk as it is a duplicate of android.test.mock.stubs and will be removed. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/Android.mk Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been deprecated. Bug: 30188076 Test: make checkbuild Change-Id: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1 Merged-In: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1 (cherry picked from commit 097130d1986b8a921c79b064991090e48173e5b9)
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-081-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2017-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1fb69251a612e2f064b418a651e5c679aeb6f528 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBill Yi2017-12-071-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23bdefa3861b985df5f0cec0cfc84e85df449e58 Auto-generated-cl: translation import
* | | | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914 -s ours am: ↵Xin Li2017-12-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 6819b9691a am: 55cf499d38 -s ours Change-Id: I01d1445d4d5bedb92c343a464d0af9c21b1df3cd
| * | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914 -s oursXin Li2017-12-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6819b9691a Change-Id: Icafe49b5f116100b493ee86c0b1504f000d4210a
| | * | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li2017-12-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d8a341b914 -s ours Change-Id: I6553c89a7d7267cc2298572fd09d64202cffd858
| | | * | | Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li2017-12-0612-20/+74
| | | |\ \ \
* | | | | | | Manually merge changes from giant AOSP topicStephen Li2017-12-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib64f9a5480b83acb2ef855d5c45a7defcdd5be8a
| * | | | | | DO NOT MERGE: Merge Oreo MR1 into master am: f630b9d122 -s oursXin Li2017-12-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: be28cec210 Change-Id: Ide80325d76a65ff630b2583cc3a816820a2cd054
| | * | | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: f630b9d122 -s ours Change-Id: Idadf26f4ef05cfbcf9b6f8b74d12d1e1ee28e017
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-02 00:52:50 +0000