aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Revert "Import translations. DO NOT MERGE""TreeHugger Robot2016-12-0580-0/+7712
|\ \ \
| * | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0580-0/+7712
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d839bdfd6d8e8639ab0361545090935b3e93c3fd. Change-Id: I3be38d6b67d63ee280af7e7bfe437157fec3752a
* | | | Merge "Revert "Import translations. DO NOT MERGE""TreeHugger Robot2016-12-0580-0/+2482
|\ \ \ \
| * | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0580-0/+2482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ceec4e8ca589e2a54c1a5510fe112a79394c9d2a. Change-Id: If3e9d05ba89811f9fae7e203e33320ff6940a140
* | | | | Merge "Revert "Import translations. DO NOT MERGE""Bill Yi2016-12-0578-0/+137828
|\ \ \ \ \
| * | | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0578-0/+137828
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 43352a250be4d4c0947ef2d348e51c7f26a5ab62. Change-Id: I931e60c4cd41bcc6251a1645b19a897d274c605a
* | | | | | Merge "Revert "Import translations. DO NOT MERGE""Bill Yi2016-12-0580-0/+16961
|\ \ \ \ \ \
| * | | | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0580-0/+16961
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1a28f5ac19dba50d99701e012ef0c85f85e3408e. Change-Id: I8b3817fb9770b7eae295492460c831e30d4817d9
* | | | | | | Merge "Revert "Import translations. DO NOT MERGE""Bill Yi2016-12-0580-0/+2160
|\ \ \ \ \ \ \
| * | | | | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0580-0/+2160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8f00d4c1b9c0d35cd18173c8f5ab3730ace35cf3. Change-Id: I9d9e06b94826c4baafcbc632a7684df5daaf0fa2
* | | | | | | | Merge "Revert "Import translations. DO NOT MERGE""Bill Yi2016-12-0580-0/+1920
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0580-0/+1920
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7d6fa7b40598396b14136ab7c292d5d849cd1294. Change-Id: I69316d5554fe0de04bc4d04acc90121217599597
* | | | | | | | | Merge "Revert "Import translations. DO NOT MERGE""Bill Yi2016-12-0578-0/+16224
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0578-0/+16224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 16d98ce511671abafd2ccb861849c613776727e5. Change-Id: Ie577a339f865e264cb9463590d354d9d8459c86f
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-12-0378-16224/+0
|\| | | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-12-0278-16224/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If48c9e27f4dc0e5cc45879a6a925c675d8c79be0 Auto-generated-cl: translation import
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-12-0380-1920/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-12-0280-1920/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7571b07fe06342ee6544daaba7f4bffefd41ef2 Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-12-0380-2160/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2016-12-0280-2160/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b4cf7d2cce712110b2b4b532af6c08ff0d85275 Auto-generated-cl: translation import
* | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-12-0380-16961/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Import translations. DO NOT MERGEBill Yi2016-12-0280-16961/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib551e9b98531f901c45b649976bacb2280234e98 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-12-0378-137828/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Import translations. DO NOT MERGEBill Yi2016-12-0278-137828/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b1d74f8904f78e27cc31e607379a574ef9536fb Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-12-0380-2482/+0
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Import translations. DO NOT MERGEBill Yi2016-12-0280-2482/+0
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I90f7514e9e392b58118f4f6b724b8c14a9328ed0 Auto-generated-cl: translation import
* / / / Import translations. DO NOT MERGEBill Yi2016-12-0280-7712/+0
|/ / / | | | | | | | | | | | | Change-Id: Ied344fb5509b8a65342ffb61da83aea1f9479574 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-11-301-2/+2
| | | | | | | | | | | | | | | Change-Id: I0fe72d8794495652c4cf6922ba81e2a5e71f1df3 Auto-generated-cl: translation import
* | | Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191 am: ↵Paul Duffin2016-11-302-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | 17a53d5e94 am: 2cb8e19413 Change-Id: I2b5941acc6fc04941687086d7eb9b992052bd139
| * | Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191Paul Duffin2016-11-302-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 17a53d5e94 Change-Id: I0592babdb41bcb9ee4110c3b6ba67787699d0959
| | * \ Merge "Use junit-host instead of junit" am: 8293d4f266Paul Duffin2016-11-302-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: e4ea7e8191 Change-Id: If20a9b9cf3df8b512a9f802d940383fba77b5ad6
| | | * \ Merge "Use junit-host instead of junit"Paul Duffin2016-11-302-3/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8293d4f266 Change-Id: Ic5bb8ac0b30e42bb30952569f49cc74705f036c9
| | | | * \ Merge "Use junit-host instead of junit"Paul Duffin2016-11-302-3/+3
| | | | |\ \
| | | | | * | Use junit-host instead of junitPaul Duffin2016-11-302-3/+3
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use framework/junit-host.jar instead of framework/junit.jar Ran the script before and after making the change and it failed in the same way with a build error but it was not due to a problem with JUnit. Bug: 30188076 Test: make checkbuild and ran the test-dicttool.sh script Change-Id: I4cdd518f38184ff3ade5a06d968d6902770ece6b
* | | | | | Import translations. DO NOT MERGEBill Yi2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I572a9003be1ce0dc4cb02de17c066ef329ad4913 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 634fc5a417 -s ours am: efa89be550 -s ours am: 2e570aae72 -s ours Change-Id: Iab41fe2f86255e0ac6f174a3b121cc850d8a13e7
| * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 634fc5a417 -s ours am: efa89be550 -s ours Change-Id: I5706d06d3c022bf56c9f7f6a5c2a6ebc8a80646c
| | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 634fc5a417 -s ours Change-Id: Ib385da702d6b94aba349f39b8c84e728573e416b
| | | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-2112-16/+16
| | | |\ \ \
* | | | | | | Import translations. DO NOT MERGE am: 11443a10b9 -s ours am: 3bbc35a294 -s ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4dca30a227 -s ours Change-Id: I1aadc42e792f3d8853cdfd1330b036687dd5e172
| * | | | | | Import translations. DO NOT MERGE am: 11443a10b9 -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3bbc35a294 -s ours Change-Id: I15b2b4c3acbb28014f01af559ae2d62ab5ac77d1
| | * | | | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 11443a10b9 -s ours Change-Id: Ifae68ac6f58c78267743bcb214aac09ddef0afae
| | | * | | | Import translations. DO NOT MERGEBill Yi2016-11-2012-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: Ib276271b318f0e132d02ee9426b5fb5c57e1187f
* | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60a9f4ca18 -s ours am: e869c4ef32 -s ours am: b2bce8b718 -s ours Change-Id: I88e26246ac6f5b6caeed5a9a53c63c232addceb1
| * | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60a9f4ca18 -s ours am: e869c4ef32 -s ours Change-Id: I7292fed672e9a19f5d1777dc3f52d05735d797db
| | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 60a9f4ca18 -s ours Change-Id: I799138b6ee168bb2ce217475ce252921b8925c52
| | | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-2177-796/+797
| | | |\ \ \ \
* | | | | | | | Import translations. DO NOT MERGE am: e8b1aebb88 -s ours am: 489f0674c8 -s ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: d3e14b8420 -s ours Change-Id: Iaf34e2f11db0d4130a3335b5143abd6347f1d8bf
| * | | | | | | Import translations. DO NOT MERGE am: e8b1aebb88 -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 489f0674c8 -s ours Change-Id: Ic068960e0e7b935b943964d87bebda716ee2a770
| | * | | | | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e8b1aebb88 -s ours Change-Id: Ib037075c687f622e9dfe6ca64173d3316674121c
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-02 00:05:54 +0000