Commit Graph

40173 Commits (677620436a1237ed638ab3d541d91b6f2e2357bf)

Author SHA1 Message Date
Bill Yi f2d6f6e7e3 Revert "Import translations. DO NOT MERGE"
This reverts commit d839bdfd6d.

Change-Id: I3be38d6b67d63ee280af7e7bfe437157fec3752a
2016-12-05 19:11:54 +00:00
Bill Yi ac0af8db68 Revert "Import translations. DO NOT MERGE"
This reverts commit ceec4e8ca5.

Change-Id: If3e9d05ba89811f9fae7e203e33320ff6940a140
2016-12-05 19:01:30 +00:00
Bill Yi 12385c91b5 Merge "Revert "Import translations. DO NOT MERGE"" 2016-12-05 18:52:34 +00:00
Bill Yi 5c6014b46b Revert "Import translations. DO NOT MERGE"
This reverts commit 43352a250b.

Change-Id: I931e60c4cd41bcc6251a1645b19a897d274c605a
2016-12-05 18:52:16 +00:00
Bill Yi e475f457bb Merge "Revert "Import translations. DO NOT MERGE"" 2016-12-05 18:51:39 +00:00
Bill Yi 87ce25e549 Revert "Import translations. DO NOT MERGE"
This reverts commit 1a28f5ac19.

Change-Id: I8b3817fb9770b7eae295492460c831e30d4817d9
2016-12-05 18:51:21 +00:00
Bill Yi 521a684829 Merge "Revert "Import translations. DO NOT MERGE"" 2016-12-05 18:47:08 +00:00
Bill Yi db3fdda3f9 Revert "Import translations. DO NOT MERGE"
This reverts commit 8f00d4c1b9.

Change-Id: I9d9e06b94826c4baafcbc632a7684df5daaf0fa2
2016-12-05 18:46:49 +00:00
Bill Yi 4406935799 Merge "Revert "Import translations. DO NOT MERGE"" 2016-12-05 18:43:35 +00:00
Bill Yi 65a6c8722e Revert "Import translations. DO NOT MERGE"
This reverts commit 7d6fa7b405.

Change-Id: I69316d5554fe0de04bc4d04acc90121217599597
2016-12-05 18:43:12 +00:00
Bill Yi f6a82163fc Merge "Revert "Import translations. DO NOT MERGE"" 2016-12-05 18:42:53 +00:00
Bill Yi 5ef058707f Revert "Import translations. DO NOT MERGE"
This reverts commit 16d98ce511.

Change-Id: Ie577a339f865e264cb9463590d354d9d8459c86f
2016-12-05 18:42:33 +00:00
TreeHugger Robot de36abbd2a Merge "Import translations. DO NOT MERGE" 2016-12-03 09:41:52 +00:00
TreeHugger Robot 9a0c626db2 Merge "Import translations. DO NOT MERGE" 2016-12-03 09:37:05 +00:00
TreeHugger Robot a6c049f355 Merge "Import translations. DO NOT MERGE" 2016-12-03 09:27:09 +00:00
TreeHugger Robot 49962b03f1 Merge "Import translations. DO NOT MERGE" 2016-12-03 09:21:57 +00:00
TreeHugger Robot b94219aa87 Merge "Import translations. DO NOT MERGE" 2016-12-03 09:18:29 +00:00
TreeHugger Robot ff6e727c2d Merge "Import translations. DO NOT MERGE" 2016-12-03 09:12:51 +00:00
Bill Yi 1a28f5ac19 Import translations. DO NOT MERGE
Change-Id: Ib551e9b98531f901c45b649976bacb2280234e98
Auto-generated-cl: translation import
2016-12-02 23:49:19 -08:00
Bill Yi d839bdfd6d Import translations. DO NOT MERGE
Change-Id: Ied344fb5509b8a65342ffb61da83aea1f9479574
Auto-generated-cl: translation import
2016-12-02 23:44:27 -08:00
Bill Yi 16d98ce511 Import translations. DO NOT MERGE
Change-Id: If48c9e27f4dc0e5cc45879a6a925c675d8c79be0
Auto-generated-cl: translation import
2016-12-02 23:43:31 -08:00
Bill Yi 43352a250b Import translations. DO NOT MERGE
Change-Id: I9b1d74f8904f78e27cc31e607379a574ef9536fb
Auto-generated-cl: translation import
2016-12-02 23:42:59 -08:00
Bill Yi 7d6fa7b405 Import translations. DO NOT MERGE
Change-Id: Ib7571b07fe06342ee6544daaba7f4bffefd41ef2
Auto-generated-cl: translation import
2016-12-02 23:42:26 -08:00
Bill Yi 8f00d4c1b9 Import translations. DO NOT MERGE
Change-Id: I8b4cf7d2cce712110b2b4b532af6c08ff0d85275
Auto-generated-cl: translation import
2016-12-02 23:41:54 -08:00
Bill Yi ceec4e8ca5 Import translations. DO NOT MERGE
Change-Id: I90f7514e9e392b58118f4f6b724b8c14a9328ed0
Auto-generated-cl: translation import
2016-12-02 23:41:14 -08:00
Bill Yi 67372336be Import translations. DO NOT MERGE
Change-Id: I0fe72d8794495652c4cf6922ba81e2a5e71f1df3
Auto-generated-cl: translation import
2016-11-30 21:41:20 -08:00
Paul Duffin 7b7b28a408 Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191 am: 17a53d5e94
am: 2cb8e19413

Change-Id: I2b5941acc6fc04941687086d7eb9b992052bd139
2016-11-30 13:50:28 +00:00
Paul Duffin 2cb8e19413 Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191
am: 17a53d5e94

Change-Id: I0592babdb41bcb9ee4110c3b6ba67787699d0959
2016-11-30 13:44:29 +00:00
Paul Duffin 17a53d5e94 Merge "Use junit-host instead of junit" am: 8293d4f266
am: e4ea7e8191

Change-Id: If20a9b9cf3df8b512a9f802d940383fba77b5ad6
2016-11-30 13:39:59 +00:00
Paul Duffin e4ea7e8191 Merge "Use junit-host instead of junit"
am: 8293d4f266

Change-Id: Ic5bb8ac0b30e42bb30952569f49cc74705f036c9
2016-11-30 13:34:27 +00:00
Paul Duffin 8293d4f266 Merge "Use junit-host instead of junit" 2016-11-30 13:27:38 +00:00
Paul Duffin 982f0fa29f Use junit-host instead of junit
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
2016-11-30 11:24:59 +00:00
Bill Yi 1a4053f540 Import translations. DO NOT MERGE
Change-Id: I572a9003be1ce0dc4cb02de17c066ef329ad4913
Auto-generated-cl: translation import
2016-11-28 21:08:58 -08:00
Bill Yi 4e26fe30c9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a417 -s ours am: efa89be550 -s ours
am: 2e570aae72  -s ours

Change-Id: Iab41fe2f86255e0ac6f174a3b121cc850d8a13e7
2016-11-21 02:49:34 +00:00
Bill Yi ab83a898e9 Import translations. DO NOT MERGE am: 11443a10b9 -s ours am: 3bbc35a294 -s ours
am: 4dca30a227  -s ours

Change-Id: I1aadc42e792f3d8853cdfd1330b036687dd5e172
2016-11-21 02:49:20 +00:00
Bill Yi b4958f714b Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca18 -s ours am: e869c4ef32 -s ours
am: b2bce8b718  -s ours

Change-Id: I88e26246ac6f5b6caeed5a9a53c63c232addceb1
2016-11-21 02:49:05 +00:00
Bill Yi e226ac84be Import translations. DO NOT MERGE am: e8b1aebb88 -s ours am: 489f0674c8 -s ours
am: d3e14b8420  -s ours

Change-Id: Iaf34e2f11db0d4130a3335b5143abd6347f1d8bf
2016-11-21 02:48:51 +00:00
Bill Yi 9bcd344ee3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ffefbfdb9d -s ours am: 630fac14b8 -s ours
am: cfcd277022  -s ours

Change-Id: I08ea86978c0eee05d3edde8e07b332e1bb46a643
2016-11-21 02:48:36 +00:00
Bill Yi 0ea92e0e06 Import translations. DO NOT MERGE am: 6da15efecc -s ours am: bed39c40ee -s ours
am: 14bd1b3c7c  -s ours

Change-Id: Ic26ac8864fc45bad9d27e4d5d5c7c9efe96fbf87
2016-11-21 02:48:21 +00:00
Bill Yi 629d4eb16b Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e6d2b89ce3 -s ours am: 01d3fde036 -s ours
am: f73f2bd9c5  -s ours

Change-Id: I8cf6161ca539046f0ed6566366dc2f556c686282
2016-11-21 02:48:07 +00:00
Bill Yi f744475055 Import translations. DO NOT MERGE am: 5ef922800e -s ours am: 11a1ebd4da -s ours
am: ff7812de7c  -s ours

Change-Id: I824076eca045921d83fd655b13df69b6b8ced4e0
2016-11-21 02:47:53 +00:00
Bill Yi a0a485a035 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 417d745e6d -s ours am: f642db22e1 -s ours
am: 30490326a6  -s ours

Change-Id: I055b1687c51a7dda29dd25dbce59a1b09454c934
2016-11-21 02:47:38 +00:00
Bill Yi 8767499c02 Import translations. DO NOT MERGE am: 1e7141667f -s ours am: df37d62628 -s ours
am: aa0a5d6e25  -s ours

Change-Id: I8507037a67f1506008899727a0eb6c804ca187ca
2016-11-21 02:47:23 +00:00
Bill Yi aabd977a20 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: abfce3ccd8 -s ours am: 2ceb4450ae -s ours
am: d443682c5f  -s ours

Change-Id: I9fd9882253538881db56a5986f50757af2fe3e25
2016-11-21 02:47:07 +00:00
Bill Yi e3f02d6916 Import translations. DO NOT MERGE am: 1834716f17 -s ours am: 28255a7813 -s ours
am: 90051a1b11  -s ours

Change-Id: Ia8e7085f18b78e9864204fc403ad390d8894081f
2016-11-21 02:46:52 +00:00
Bill Yi 4fe3657c85 Import translations. DO NOT MERGE am: 9be2112b57 -s ours am: 2729361edd -s ours
am: 6d4b3a0280  -s ours

Change-Id: I542ce22553432a89b3955db845cca36cb9280be2
2016-11-21 02:46:37 +00:00
Bill Yi 2e570aae72 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a417 -s ours
am: efa89be550  -s ours

Change-Id: I5706d06d3c022bf56c9f7f6a5c2a6ebc8a80646c
2016-11-21 02:28:28 +00:00
Bill Yi 4dca30a227 Import translations. DO NOT MERGE am: 11443a10b9 -s ours
am: 3bbc35a294  -s ours

Change-Id: I15b2b4c3acbb28014f01af559ae2d62ab5ac77d1
2016-11-21 02:28:12 +00:00
Bill Yi b2bce8b718 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca18 -s ours
am: e869c4ef32  -s ours

Change-Id: I7292fed672e9a19f5d1777dc3f52d05735d797db
2016-11-21 02:27:58 +00:00
Bill Yi d3e14b8420 Import translations. DO NOT MERGE am: e8b1aebb88 -s ours
am: 489f0674c8  -s ours

Change-Id: Ic068960e0e7b935b943964d87bebda716ee2a770
2016-11-21 02:27:45 +00:00