aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Merge "Move LatinIME and its lib to /product" am: 149b9d4f6eAnton Hansson2019-01-143-0/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 84d156b1e6 Change-Id: I386b9b5ed6ba02a4cd00efb75804ffef24603a2c
| | * \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-01-130-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 06c8063be0 -s ours am skip reason: subject contains skip directive Change-Id: I361ed1fa55f6dc6d7b7aee8984e61873114988fb
| | | * | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-01-141-1/+1
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBill Yi2019-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9baa804b18e008b1083ef970d9d3c12498364744
| | * | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-01-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 54b7ed4a9d -s ours am skip reason: subject contains skip directive Change-Id: Iccec905e74b8a20923ddf92db0beda0278d5cdfb
| | | * | | | Import translations. DO NOT MERGEBill Yi2019-01-131-2/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I55aec88a6c77441c68c7121cab8dcce25d5ef4cc
| | * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-12-280-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2d2288f37c -s ours Change-Id: I496ac1555af61b6f2e8a52074e2416ad1113a320
| | | * | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-12-282-2/+2
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBill Yi2018-12-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Iedbf75b9435c748ada110ea50847d4be9efe5f79
| | * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-12-280-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ba23f94b7b -s ours Change-Id: Ib222f7a1f0a43d6b0adea55afca349dc6bd83319
| | | * | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-12-285-17/+17
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEBill Yi2018-12-285-17/+17
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id860302ad84eb62980b4a945874cb45edfdcc687
| | * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-12-280-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e921fbc7db -s ours Change-Id: I93766f2c63586fd097f0dd6f590bdeb73b5fdb95
| | | * | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-12-283-7/+7
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEBill Yi2018-12-283-7/+7
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1bb720f59308fd358bf855f68bec70fa4884f197
| | * | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-12-280-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3d3c1cd8bc -s ours Change-Id: I03c34a8e17282a8e2e5a02fdee1132a829d55909
| | | * | | | Import translations. DO NOT MERGEBill Yi2018-12-282-4/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6c89395f7bef7820235bd25d506493ab2bd577e5
| | * | | | Merge "Fix performance-for-range-copy warnings" am: db2e4888f8Chih-Hung Hsieh2018-12-113-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 947f8ee063 Change-Id: I153c9732d7fd1733f196b9807d99cfe59fcde012
| | * \ \ \ \ [automerger skipped] Merge "DO NOT MERGE" am: 55748c5936 -s oursThe Android Open Source Project2018-12-060-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 49424a1b52 -s ours Change-Id: Iaf13380ed7bfbf451a004c18ef2780073fd9c3f7
| | * \ \ \ \ \ Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212Yohei Yukawa2018-11-192-0/+192
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 91bb8ea67e Change-Id: I1693b71dd6e5b9c3ad8b8d994545f77907903258
| | * \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-11-100-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f1f7f05512 -s ours Change-Id: I0b994052232b5b9d0c8a2e7831405b46154b666f
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-11-100-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9727374039 -s ours Change-Id: I89930319804866d4828517d06941049afb70412c
| | * \ \ \ \ \ \ \ Merge "Convert to Android.bp" am: 128f68acb2Dan Willemsen2018-11-0839-1081/+533
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8e315deff9 Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
| | * \ \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-11-060-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a04a34ee7 -s ours Change-Id: I816243c0ed8b9eb9fb26d266154162f3bf0c392d
| | * \ \ \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-11-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 13611e7a26 -s ours Change-Id: I3c42d26416feedb8b7bfb9862744fcd0c22da76d
| | * \ \ \ \ \ \ \ \ \ \ Merge "Fix dicttool build" am: a92d0f9262Tadashi G. Takaoka2018-10-3112-61/+1193
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 438a303732 Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
| | * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-10-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9855237563 -s ours Change-Id: I9c79f7537f938ffb2ad35aa10e90da11bf33ee19
| | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c42acc5344 -s ours am: 49962938cd -s ours Change-Id: Idbf577a6d169abc1210dd51d1ed171a15c4ec116
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: a5a6293c3e -s ours Change-Id: Ie762dbf883cdeb76d6441da58cb32d9c170c60ca
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pi-dr1-dev to aosp-master am: 265cd16db2Bill Yi2018-10-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b445ba31e3 Change-Id: Ide69e3c6ffaf78a74428ee4627da22bdeedf1a3b
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-10-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 67efbc844c -s ours Change-Id: Ic593c6d12dd7e9450a8d606a39c5ec128fb95772
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove paulduffin@ from OWNERS" am: e2a4d47ff2Paul Duffin2018-10-151-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 69989d1156 Change-Id: Ie8a5d726a5250134313f436eba5b871ff1a5039b
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: fe42418de4 -s ours Change-Id: I04ccad51a0335212a71a0b9045a2eea6ba9495f1
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 5958fb4cbc -s ours Change-Id: Ie64b997b3cb56737b62bdb84d6d68ed21e37f525
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 0ca0ed10c3 -s ours Change-Id: I7e40179518929c497f9eb88495bd7478cc3dbd00
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: f1e3e4c5a8 -s ours Change-Id: If15f3fcb0f5857b719a7f2c9799d775c6cd2896c
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 051ebe1f67 -s ours Change-Id: I357d322111f9d35c1c37be17debda50e94b26e41
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4f8a5c0dd6 -s ours Change-Id: I2e91fa4b3c5f7d821f011f1da1842283484fe9df
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add default code reviewers." am: f468c00bdfChih-hung Hsieh2018-10-051-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d4f3ede0c7 Change-Id: Ib16b75fffe467ce9714977c844cb850d4bc48025
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add noexcept to move constructors and assignment operators." am: ↵Chih-Hung Hsieh2018-10-052-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61d3a1d39b am: 587239f195 Change-Id: Ibf8c384fafcd92567f7696f076b34a897d95cc9b
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-09-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8353ab156f -s ours Change-Id: I2abdd1b30fc382712b208d383310833d7fc70c61
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-09-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8f67a3867c -s ours Change-Id: I44858412e07bf9df60d782ae8c0349f7cdcde4b5
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-09-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 49192ae51d -s ours Change-Id: I1ad10be0c21ed2cd3c94d399cfc94e702dda7f02
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge stage-dr1-aosp-master into stage-aosp-masterXin Li2018-08-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: efeceaa60c Change-Id: I900f02260278cdf2d28b77c57bbebddceeeb7fa7
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge Android Pie into master" am: 0b6bd00834 am: d88e3094deXin Li2018-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0af05508c9 Change-Id: Icadf7caebc9cf6313e028de0808fe3832ae99367
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 7fee2eab02 -s ours am: bab98e72ad -s ours Change-Id: I5921c0032b6d3d28745cbb7e0c2ddf54a13232ef
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 9a9aec3313 -s ours am: 205a2f40ba -s ours Change-Id: Id001f3991859b1657cedce9f71257730340371a5
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: c74fcad61b -s ours am: 5b294cccf9 -s ours Change-Id: Ifc27631ac1ecfd7c86ecc18bab8e2cb207682351
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 957b4da1b0 -s ours am: 5511368d7e -s ours Change-Id: I0531e3400725a9a2eb73fb498d272ff0120c6cb5
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2018-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 43f8f1d5fd -s ours am: 50ae03af3f -s ours Change-Id: I0bbeaa7ff12db5ffa176811d2d27e9c6f8d2fc67