Tadashi G. Takaoka
6aed05232b
Merge "Fix dicttool build" am: a92d0f9262
...
am: 438a303732
Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
2018-10-31 09:18:51 -07:00
Tadashi G. Takaoka
438a303732
Merge "Fix dicttool build"
...
am: a92d0f9262
Change-Id: I154c551c433cc8ef4a17268d57429e38ab962be0
2018-10-31 09:10:41 -07:00
Treehugger Robot
a92d0f9262
Merge "Fix dicttool build"
2018-10-31 15:59:23 +00:00
Bill Yi
9468765b14
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9855237563
-s ours
Change-Id: I9c79f7537f938ffb2ad35aa10e90da11bf33ee19
2018-10-29 11:47:38 -07:00
Tadashi G. Takaoka
6a1b37353d
Fix dicttool build
...
This CL partially reverts
- Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
- I05c7d8429e8d9a26139456763c77997340fea8c2
And followup (remove shortcut support)
- I73b7dc008a5acaf75a31a36a2d332b5afabd82d0
Bug: 28255684
Test: make -j10 dicttool_aosp
Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
2018-10-29 15:59:05 +09:00
Bill Yi
9855237563
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27785eae6f6e44e130a7cad0cfedeb8ed630e95f
2018-10-28 14:41:50 -07:00
Bill Yi
e9c8624a2d
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c42acc5344
-s ours
...
am: 49962938cd
-s ours
Change-Id: Idbf577a6d169abc1210dd51d1ed171a15c4ec116
2018-10-24 18:54:49 -07:00
Bill Yi
49962938cd
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: c42acc5344
-s ours
Change-Id: I3c7d427021df4d397825c057b542f86af61463bd
2018-10-24 15:50:27 -07:00
Bill Yi
c42acc5344
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: I3d15592c5348f486cff59899be87a4ee0e83f49e
2018-10-24 14:47:31 -07:00
Bill Yi
7898118eab
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: a5a6293c3e
-s ours
Change-Id: Ie762dbf883cdeb76d6441da58cb32d9c170c60ca
2018-10-24 09:45:44 -07:00
Bill Yi
a5a6293c3e
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I3ee77030c1d13c9ec62399268c4376989863c607
2018-10-24 09:07:17 -07:00
Bill Yi
86c77e01ef
Merge pi-dr1-dev to aosp-master am: 265cd16db2
...
am: b445ba31e3
Change-Id: Ide69e3c6ffaf78a74428ee4627da22bdeedf1a3b
2018-10-19 15:29:29 -07:00
Bill Yi
b445ba31e3
Merge pi-dr1-dev to aosp-master
...
am: 265cd16db2
Change-Id: I5299e4e7abe18f0a8d047dcf546c8e241f04d2d9
2018-10-19 15:12:31 -07:00
Bill Yi
265cd16db2
Merge pi-dr1-dev to aosp-master
...
Change-Id: I335f17b757a13ef34f4abb6fd159bcaa3574a1b2
2018-10-19 12:20:51 -07:00
Bill Yi
de676d6315
[automerger skipped] Import translations. DO NOT MERGE
...
am: 67efbc844c
-s ours
Change-Id: Ic593c6d12dd7e9450a8d606a39c5ec128fb95772
2018-10-15 15:42:30 -07:00
Bill Yi
67efbc844c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8f0f4691bcdb730d71feae0616c65f1e38b99b06
2018-10-15 09:48:59 -07:00
Paul Duffin
da077adb06
Merge "Remove paulduffin@ from OWNERS" am: e2a4d47ff2
...
am: 69989d1156
Change-Id: Ie8a5d726a5250134313f436eba5b871ff1a5039b
2018-10-15 05:13:10 -07:00
Paul Duffin
69989d1156
Merge "Remove paulduffin@ from OWNERS"
...
am: e2a4d47ff2
Change-Id: I78e339ead245e67fce1233f304f01518ed61bd99
2018-10-15 05:05:57 -07:00
Paul Duffin
e2a4d47ff2
Merge "Remove paulduffin@ from OWNERS"
2018-10-15 11:52:49 +00:00
Bill Yi
6141ad5079
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: fe42418de4
-s ours
Change-Id: I04ccad51a0335212a71a0b9045a2eea6ba9495f1
2018-10-13 19:59:49 -07:00
Bill Yi
cf6ae73d4c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 5958fb4cbc
-s ours
Change-Id: Ie64b997b3cb56737b62bdb84d6d68ed21e37f525
2018-10-13 19:59:34 -07:00
Bill Yi
56fbe87528
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 0ca0ed10c3
-s ours
Change-Id: I7e40179518929c497f9eb88495bd7478cc3dbd00
2018-10-13 19:59:19 -07:00
Bill Yi
221b18b183
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: f1e3e4c5a8
-s ours
Change-Id: If15f3fcb0f5857b719a7f2c9799d775c6cd2896c
2018-10-13 19:59:04 -07:00
Bill Yi
3bd0ac6a1e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 051ebe1f67
-s ours
Change-Id: I357d322111f9d35c1c37be17debda50e94b26e41
2018-10-13 19:58:48 -07:00
Bill Yi
50989e70dd
[automerger skipped] Import translations. DO NOT MERGE
...
am: 4f8a5c0dd6
-s ours
Change-Id: I2e91fa4b3c5f7d821f011f1da1842283484fe9df
2018-10-13 19:58:31 -07:00
TreeHugger Robot
fe42418de4
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2018-10-14 02:47:56 +00:00
TreeHugger Robot
5958fb4cbc
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2018-10-14 02:47:54 +00:00
TreeHugger Robot
0ca0ed10c3
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2018-10-14 02:47:35 +00:00
TreeHugger Robot
f1e3e4c5a8
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2018-10-14 02:46:38 +00:00
TreeHugger Robot
051ebe1f67
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2018-10-14 02:44:16 +00:00
Bill Yi
54e8416096
Import translations. DO NOT MERGE
...
Change-Id: Id26d6b48ca52c631b3f2041682663f07b49e4b80
Auto-generated-cl: translation import
2018-10-13 08:35:07 -07:00
Bill Yi
946631933a
Import translations. DO NOT MERGE
...
Change-Id: I76dbccb4e65ebb99db55049222d6fe361d08d9fc
Auto-generated-cl: translation import
2018-10-13 08:34:10 -07:00
Bill Yi
b0fc52fca9
Import translations. DO NOT MERGE
...
Change-Id: I0606bc4b8d8c37ef386f1af4764a6887b86017f5
Auto-generated-cl: translation import
2018-10-13 08:32:35 -07:00
Bill Yi
4f8a5c0dd6
Import translations. DO NOT MERGE
...
Change-Id: Id8ca0f5d84e52df495611542f8c52e63329d531a
Auto-generated-cl: translation import
2018-10-13 08:31:41 -07:00
Bill Yi
819b30680c
Import translations. DO NOT MERGE
...
Change-Id: I915ddb171c85d7f9f1428bb52e60727a9e254a60
Auto-generated-cl: translation import
2018-10-13 08:30:21 -07:00
Bill Yi
3725a3fbca
Import translations. DO NOT MERGE
...
Change-Id: I521ffadf560fd919a12387844ba6799a024884b1
Auto-generated-cl: translation import
2018-10-13 08:28:46 -07:00
Paul Duffin
14720ca8cb
Remove paulduffin@ from OWNERS
...
Test: n/a
Change-Id: I24503d403feefbed40475660983493fb2991d9a8
2018-10-10 16:15:41 +01:00
Chih-hung Hsieh
a439d719ec
Merge "Add default code reviewers." am: f468c00bdf
...
am: d4f3ede0c7
Change-Id: Ib16b75fffe467ce9714977c844cb850d4bc48025
2018-10-05 16:49:13 -07:00
Chih-hung Hsieh
d4f3ede0c7
Merge "Add default code reviewers."
...
am: f468c00bdf
Change-Id: I619cbeacfd8ed9812da2cfd065bf4e16b86f8492
2018-10-05 16:43:07 -07:00
Chih-hung Hsieh
f468c00bdf
Merge "Add default code reviewers."
2018-10-05 23:29:08 +00:00
Chih-Hung Hsieh
29e9618485
Add default code reviewers.
...
Since they are commented out, their approval is not required,
but they could be the default or find right reviewers.
Bug: 33166666
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ic35da4cd5ecaff615731c25a3bf99df5a43ef35b
2018-10-05 13:13:32 -07:00
Chih-Hung Hsieh
9c58fe67f0
Merge "Add noexcept to move constructors and assignment operators." am: 61d3a1d39b
...
am: 587239f195
Change-Id: Ibf8c384fafcd92567f7696f076b34a897d95cc9b
2018-10-05 12:21:24 -07:00
Chih-Hung Hsieh
587239f195
Merge "Add noexcept to move constructors and assignment operators."
...
am: 61d3a1d39b
Change-Id: I72e2f3ff7947df9648cc7227dda490e3d565362b
2018-10-05 11:48:28 -07:00
Treehugger Robot
61d3a1d39b
Merge "Add noexcept to move constructors and assignment operators."
2018-10-05 18:20:29 +00:00
Bill Yi
548746a934
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 8353ab156f
-s ours
Change-Id: I2abdd1b30fc382712b208d383310833d7fc70c61
2018-09-29 14:43:15 -07:00
Bill Yi
e3e686492c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 8f67a3867c
-s ours
Change-Id: I44858412e07bf9df60d782ae8c0349f7cdcde4b5
2018-09-29 14:43:03 -07:00
Bill Yi
28dd295e7f
[automerger skipped] Import translations. DO NOT MERGE
...
am: 49192ae51d
-s ours
Change-Id: I1ad10be0c21ed2cd3c94d399cfc94e702dda7f02
2018-09-29 14:42:31 -07:00
TreeHugger Robot
8353ab156f
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-09-29 21:29:24 +00:00
TreeHugger Robot
8f67a3867c
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-09-29 21:26:16 +00:00
Bill Yi
49192ae51d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9784cfcb5280e415a04ad109c5ddee33997f7261
2018-09-28 21:46:47 -07:00