aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| | | * | | | | Import translations. DO NOT MERGEBill Yi2016-11-2077-796/+797
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: I813a327d9361336da3ea4aac39a6ef0b345263af
* | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffefbfdb9d -s ours am: 630fac14b8 -s ours am: cfcd277022 -s ours Change-Id: I08ea86978c0eee05d3edde8e07b332e1bb46a643
| * | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffefbfdb9d -s ours am: 630fac14b8 -s ours Change-Id: I1df41a9ac5d9cf4b8674c4f9ade533764fc7a0b4
| | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: ffefbfdb9d -s ours Change-Id: Ifd52d59dd56df8a4a756929a2c17b6dc65183f0b
| | | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-214-4/+4
| | | |\ \ \ \
* | | | | | | | Import translations. DO NOT MERGE am: 6da15efecc -s ours am: bed39c40ee -s ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 14bd1b3c7c -s ours Change-Id: Ic26ac8864fc45bad9d27e4d5d5c7c9efe96fbf87
| * | | | | | | Import translations. DO NOT MERGE am: 6da15efecc -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bed39c40ee -s ours Change-Id: I7274e1eb0f992bfccdc219b16c27f4b85b9cffd2
| | * | | | | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6da15efecc -s ours Change-Id: Ib85e72286f3cdbd05fa5ba8798dc7a5cff3a6543
| | | * | | | | Import translations. DO NOT MERGEBill Yi2016-11-204-4/+4
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: Iee950938a55411791e85a59bf4b91dc7f5cd6df4
* | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6d2b89ce3 -s ours am: 01d3fde036 -s ours am: f73f2bd9c5 -s ours Change-Id: I8cf6161ca539046f0ed6566366dc2f556c686282
| * | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6d2b89ce3 -s ours am: 01d3fde036 -s ours Change-Id: I4fd1d32c2bb9321683879d1b96623b2658cf7775
| | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: e6d2b89ce3 -s ours Change-Id: I1a2ac70bf62670f8f6da2365d2e4bc1fe502c099
| | | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-212-15/+15
| | | |\ \ \ \
* | | | | | | | Import translations. DO NOT MERGE am: 5ef922800e -s ours am: 11a1ebd4da -s ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: ff7812de7c -s ours Change-Id: I824076eca045921d83fd655b13df69b6b8ced4e0
| * | | | | | | Import translations. DO NOT MERGE am: 5ef922800e -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 11a1ebd4da -s ours Change-Id: Ib303ee920077a3d390b4e8ea5fe02de2f565842c
| | * | | | | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5ef922800e -s ours Change-Id: I614d0185f5fb5ad1f8df96cb7aadf4e7dc6279ac
| | | * | | | | Import translations. DO NOT MERGEBill Yi2016-11-202-15/+15
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: Id8b1086d2959c82b9bf0501b2ec09f4f06f92a59
* | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 417d745e6d -s ours am: f642db22e1 -s ours am: 30490326a6 -s ours Change-Id: I055b1687c51a7dda29dd25dbce59a1b09454c934
| * | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 417d745e6d -s ours am: f642db22e1 -s ours Change-Id: I3143f7e9a2124e658717081e720945f826a6ce00
| | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 417d745e6d -s ours Change-Id: Ic677a160062156ebc625cbd3788781be6a826959
| | | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-211-1/+1
| | | |\ \ \ \
* | | | | | | | Import translations. DO NOT MERGE am: 1e7141667f -s ours am: df37d62628 -s ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: aa0a5d6e25 -s ours Change-Id: I8507037a67f1506008899727a0eb6c804ca187ca
| * | | | | | | Import translations. DO NOT MERGE am: 1e7141667f -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: df37d62628 -s ours Change-Id: Ic40bef3a9a5a8d9797493ce274b042009056e8d4
| | * | | | | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1e7141667f -s ours Change-Id: Icd105089195ebe121b1ac9d82d056865c6999d2a
| | | * | | | | Import translations. DO NOT MERGEBill Yi2016-11-201-1/+1
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: I63f2e9abe968d6a37abef2f6bc3cc200e9a669a8
* | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abfce3ccd8 -s ours am: 2ceb4450ae -s ours am: d443682c5f -s ours Change-Id: I9fd9882253538881db56a5986f50757af2fe3e25
| * | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abfce3ccd8 -s ours am: 2ceb4450ae -s ours Change-Id: I6cb867e68f1c64ac1620171a99df4c0e001480ec
| | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: abfce3ccd8 -s ours Change-Id: I5fe046b806d8189ab067db009b2168d2eceade3b
| | | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-211-2/+2
| | | |\ \ \ \
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-07-24 06:43:51 +0000