OSDN Git Service
Bill Yi [Sun, 14 Oct 2018 02:58:16 +0000 (19:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ac3faed024 -s ours
Change-Id: Iab5bd389095638fe5a458df70e3aa13c0d70cafa
Bill Yi [Sat, 13 Oct 2018 15:24:52 +0000 (08:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idc1a42f10ddcf8c186c2123ee8d9f65db6e9eb8e
Auto-generated-cl: translation import
Bill Yi [Sat, 29 Sep 2018 21:30:16 +0000 (14:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0869a7ceb5 -s ours
Change-Id: If8ab7c35ab47d5fa0c416188acda96802ad98f98
Bill Yi [Sat, 29 Sep 2018 07:07:13 +0000 (00:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idf9b6201486de1af357a0508f54336304e348a88
Inseob Kim [Wed, 5 Sep 2018 03:03:31 +0000 (20:03 -0700)]
Merge "Fix improper transition from gallery to camera" am:
bd400d88d9
am:
325f17593d
Change-Id: I44b800b44802cc5ac1cabbb48c98c07eff3ffbdf
Inseob Kim [Wed, 5 Sep 2018 02:58:26 +0000 (19:58 -0700)]
Merge "Fix improper transition from gallery to camera"
am:
bd400d88d9
Change-Id: I0f805deaf14c21eb0a1ec340f8f649d78c983880
Treehugger Robot [Wed, 5 Sep 2018 02:51:53 +0000 (02:51 +0000)]
Merge "Fix improper transition from gallery to camera"
Inseob Kim [Thu, 30 Aug 2018 02:36:36 +0000 (11:36 +0900)]
Fix improper transition from gallery to camera
Camera app has been wrongly falling back from the gallery to camera
activity. It happens when a user deletes images and only one image left.
This patch fixes it so that the app can stay at the gallery.
Bug:
113361301
Test: 1) Capture a few photos.
2) Move to film view by dragging screen from right to left.
3) Try to delete photos except one by dragging from bottom to up.
Change-Id: I72c0c678df76386e891a9a1b3dfcaa7e452afd27
Xin Li [Tue, 14 Aug 2018 00:29:36 +0000 (17:29 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
am:
a6d0b94b37
Change-Id: I3997875bf9c33f58209687a8b1d18de4a139191c
Xin Li [Mon, 13 Aug 2018 20:01:15 +0000 (13:01 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
Bug:
112535855
Change-Id: I20d6496a784ff897f695972606265684b9f8f0ae
Xin Li [Wed, 8 Aug 2018 05:23:33 +0000 (22:23 -0700)]
Merge "Merge Android Pie into master" am:
ea4078b9f8 am:
240d59bd88
am:
a6a3ac640f
Change-Id: I02a74c264fdcbfae5140b2c76c3f097db7a7239a
Xin Li [Wed, 8 Aug 2018 01:11:58 +0000 (18:11 -0700)]
Merge "Merge Android Pie into master" am:
ea4078b9f8
am:
240d59bd88
Change-Id: I46793022c5b0b05e157001885c91266eceac0db3
Xin Li [Tue, 7 Aug 2018 21:39:56 +0000 (14:39 -0700)]
Merge "Merge Android Pie into master"
am:
ea4078b9f8
Change-Id: I01db0e6436ac50b88e1a91f3b919c7b6c78692e7
Xin Li [Tue, 7 Aug 2018 16:51:26 +0000 (16:51 +0000)]
Merge "Merge Android Pie into master"
Xin Li [Mon, 6 Aug 2018 23:51:14 +0000 (16:51 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: I05f52927dd22cc8f6fa4827dbe7addb3839106a8
Bill Yi [Sat, 4 Aug 2018 14:33:42 +0000 (07:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
20ac5ce5cb -s ours
am:
c7e65586f7 -s ours
Change-Id: I64719c37d0d191018296d8ed73f64a531f9eb1b6
Bill Yi [Sat, 4 Aug 2018 14:29:11 +0000 (07:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
20ac5ce5cb -s ours
Change-Id: Iea7a27543e33d89ea36cdff3104765ae0233d1f6
Bill Yi [Sat, 4 Aug 2018 12:23:35 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib966a60ba52770103f34103f3291e13d4e209339
Auto-generated-cl: translation import
Bill Yi [Thu, 5 Jul 2018 04:17:16 +0000 (21:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
30b9cfb2a4 -s ours
Change-Id: I70309ef41ece23d2294bf2be05895f1c8846b451
Bill Yi [Wed, 4 Jul 2018 17:44:57 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I03cc10fced61ae564ad364b9b254f4c96b0cb4a9
Bill Yi [Mon, 11 Jun 2018 18:39:16 +0000 (11:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2494723d40 -s ours
Change-Id: I25d0611696a5010e6e43f68e3bf529cad93d5cb1
Bill Yi [Sat, 9 Jun 2018 17:47:10 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id4cc7d9ca482e17044acce94d2a12a619761adfc
Xin Li [Sat, 9 Jun 2018 09:55:07 +0000 (02:55 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
b11752bba7
Change-Id: If8d229b75b68304c5553ebe42f74996e4db6848a
Xin Li [Fri, 8 Jun 2018 18:07:56 +0000 (11:07 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: I1654ea88799d1d23f2cd3956563451e3c7ef698c
Bill Yi [Thu, 31 May 2018 18:35:11 +0000 (11:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
b49660ac79 -s ours
Change-Id: I384de897a6bdea684096d88a226bffabf0d54a28
Bill Yi [Thu, 31 May 2018 03:40:15 +0000 (20:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I921370cf3e71f04252754f28a0cdf7d5e76a90a4
Chao Zhang [Tue, 29 May 2018 19:39:59 +0000 (12:39 -0700)]
Merge "Fix a mistake of CameraAgentFactory's recycle();" am:
c7a2095139
am:
3a06cce41f
Change-Id: I54ba29a63c2d14bed3d14b001dd43b98403041d2
Chao Zhang [Tue, 29 May 2018 19:33:03 +0000 (12:33 -0700)]
Merge "Fix a mistake of CameraAgentFactory's recycle();"
am:
c7a2095139
Change-Id: I476e40fe4959e04a1190752764b935e55c99ab73
Treehugger Robot [Tue, 29 May 2018 19:23:56 +0000 (19:23 +0000)]
Merge "Fix a mistake of CameraAgentFactory's recycle();"
Bill Yi [Fri, 25 May 2018 00:40:37 +0000 (17:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
6e9b71e1d7 -s ours
Change-Id: Ia2dea698b25f0c180a3313b9f0cc58d00ffcdb6a
Bill Yi [Thu, 24 May 2018 18:58:53 +0000 (11:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ifff0578c1786bc79b73c4be24dcf3041097d66c1
Bill Yi [Wed, 23 May 2018 21:23:35 +0000 (14:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
92f1a41bc3 -s ours
Change-Id: I313359ab650006fbde70cf92181c129a13bf42ad
Bill Yi [Tue, 22 May 2018 23:13:24 +0000 (16:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0b364305a77d21bd6988bef7f0415efc324b7c9f
Bill Yi [Sun, 20 May 2018 13:54:37 +0000 (06:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e9a2e68f3b -s ours
Change-Id: I4d0c5bdf8a303ebf17ca17661aa33d27b617455b
Bill Yi [Sun, 20 May 2018 10:33:36 +0000 (03:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icf39abf18c8804e5da13b1249754dd1e45159cf3
Bill Yi [Sun, 13 May 2018 05:01:07 +0000 (22:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
333844ee5a -s ours
Change-Id: Ic32371f685009a9ef5bccd4eb46257df0fc42725
Bill Yi [Sat, 12 May 2018 14:22:54 +0000 (07:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I61676e859fdbcaa721e101d3319da66a77560adc
Chao Zhang [Thu, 3 May 2018 14:45:17 +0000 (22:45 +0800)]
Fix a mistake of CameraAgentFactory's recycle();
Ensure CameraAgentFactory's recycle() is called in AppUpgrader and PictureSizeLoader,
so sAndroidCameraAgent will be recycle correctly.
Change-Id: Ie1867383fdd39b50cf73646fcbd8784ac8c78658
Bill Yi [Sat, 28 Apr 2018 04:45:52 +0000 (21:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7a4bca2451 -s ours
Change-Id: I4609036f1d4c08b2e0291fd63f2c6f99decf4446
Bill Yi [Sat, 28 Apr 2018 03:02:12 +0000 (20:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia9d7292c5d5313abd8252f43dda61dab33bcea83
Bill Yi [Tue, 17 Apr 2018 14:31:42 +0000 (07:31 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
d0751716b4 -s ours
Change-Id: Ibc9c4677e1f8c38bddaf65e56dcd0993af4db184
Bill Yi [Tue, 17 Apr 2018 12:47:38 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id004baf7550414e9e59e175c1f4721539c69fb89
Bill Yi [Sun, 15 Apr 2018 01:59:06 +0000 (18:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
deb1c90c99 -s ours
Change-Id: I3db1ef61bf220cc62d1d0a8e4a96aee357216b58
Bill Yi [Fri, 13 Apr 2018 20:06:08 +0000 (13:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8dd4db8a188fc16559419de9d87daf74e0b64819
Bill Yi [Sat, 7 Apr 2018 03:34:03 +0000 (20:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2fce5c92a8 -s ours
Change-Id: I3a5d12b0eec9df2789ea7465c4fe4f82c01ac320
Bill Yi [Fri, 6 Apr 2018 17:52:27 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia302abb8a7de46eeb422035a450132dd6d72ceca
Bill Yi [Thu, 29 Mar 2018 15:12:18 +0000 (15:12 +0000)]
[automerger skipped] Import translations. DO NOT MERGE
am:
a2c5a111c6 -s ours
Change-Id: I27ad4019b4024c5fdaf61cd3a456cef41f576858
Bill Yi [Thu, 29 Mar 2018 00:28:19 +0000 (17:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iace8630dfd5d9f35cd0849f8b63e29fd35075254
Bill Yi [Fri, 9 Mar 2018 21:23:52 +0000 (21:23 +0000)]
Import translations. DO NOT MERGE am:
d8b59a6892 -s ours
am:
7ccd89ab81 -s ours
Change-Id: I443a9acf71ecd2523a138e3eff53cc2f0e918ce7
Bill Yi [Fri, 9 Mar 2018 20:18:26 +0000 (20:18 +0000)]
Import translations. DO NOT MERGE
am:
271692ede4 -s ours
Change-Id: I9e52cc3e9cf9bef1755b5fa1a4f997a4d512d7bc
Bill Yi [Fri, 9 Mar 2018 04:43:51 +0000 (04:43 +0000)]
Import translations. DO NOT MERGE
am:
d8b59a6892 -s ours
Change-Id: Ibb49505db1be1933f4bbbbeacb924feeda4ef3ed
Bill Yi [Thu, 8 Mar 2018 22:42:34 +0000 (14:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id726b995f5e4123c968960e07e9e0cd4c6fa2001
Bill Yi [Thu, 8 Mar 2018 22:41:27 +0000 (14:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I37d0993841aea1210d0782e77fc217b02be1ddd2
Bill Yi [Sat, 3 Mar 2018 13:02:07 +0000 (13:02 +0000)]
Import translations. DO NOT MERGE am:
55151b2b02 -s ours
am:
d971298e3a -s ours
Change-Id: I5dc6df21fef852194c921a83b5ddb81f4f9839d0
Bill Yi [Sat, 3 Mar 2018 12:57:36 +0000 (12:57 +0000)]
Import translations. DO NOT MERGE
am:
55151b2b02 -s ours
Change-Id: Ieb3787d64479bb7042431e773f6ab8ba19305fca
TreeHugger Robot [Fri, 2 Mar 2018 21:44:14 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 2 Mar 2018 01:13:37 +0000 (17:13 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icb348ac3d74b006c12772f7b1cd0bfc9e6965d70
Bill Yi [Fri, 2 Mar 2018 01:12:33 +0000 (17:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0f86112614e3280f3f354269caaa2bef995e322e
Auto-generated-cl: translation import
Derek Sollenberger [Fri, 23 Feb 2018 18:31:38 +0000 (13:31 -0500)]
Stop using deprecated Canvas APIs.
Bug:
73777445
Test: compile
Change-Id: Ib8a0b7dcbe606c2a1a9df26549cc805c6eeb892b
Bill Yi [Mon, 26 Feb 2018 20:07:28 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1c4559edba9d4cab4d55830608dffb5693251896
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 22 Feb 2018 04:55:41 +0000 (04:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Nan Zhang [Thu, 22 Feb 2018 02:36:40 +0000 (02:36 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build" am:
6c904ced81 am:
052a3a63c0
am:
14099e84b7
Change-Id: I43e30a73055b9923cc6cdd39e1f169204561da39
Nan Zhang [Thu, 22 Feb 2018 02:29:31 +0000 (02:29 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build" am:
6c904ced81
am:
052a3a63c0
Change-Id: I79497cc430668f8a9aa01dbf04450c97ce26c33d
Nan Zhang [Thu, 22 Feb 2018 02:21:25 +0000 (02:21 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build"
am:
6c904ced81
Change-Id: Iebf1b6d884116a10233e572318170a10b3bd650e
Treehugger Robot [Thu, 22 Feb 2018 02:07:15 +0000 (02:07 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build"
Bill Yi [Thu, 22 Feb 2018 00:53:15 +0000 (16:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89d002751f7a15ef9a77ec518830daa0dc580cfa
Auto-generated-cl: translation import
Nan Zhang [Tue, 20 Feb 2018 21:27:56 +0000 (13:27 -0800)]
Use HAS_BUILD_NUMBER to check engineering build
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.
Test: m -j32
Bug: b/
70351683
Change-Id: I95fcc5c92130182a3720f3c08469f196d7f7b4f9
TreeHugger Robot [Tue, 20 Feb 2018 22:46:17 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 20 Feb 2018 18:16:06 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE am:
00c4e3f78a -s ours
am:
9f8b73f2cb -s ours
Change-Id: If0de5401e908465fb23003d9963191379e9a8e35
Bill Yi [Tue, 20 Feb 2018 18:08:45 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE
am:
00c4e3f78a -s ours
Change-Id: Ice2b164b67bf58692c77c516709f0377957a0032
Bill Yi [Tue, 20 Feb 2018 11:00:38 +0000 (03:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id6cfd543e0d94b6c52b909c9c9280d887b361320
Bill Yi [Tue, 20 Feb 2018 10:59:34 +0000 (02:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ife0104b684617ac09f3c7de7075c38c2c0d7b07a
Auto-generated-cl: translation import
Alan Viverette [Thu, 8 Feb 2018 22:19:40 +0000 (17:19 -0500)]
Migrate to AAPT2
Bug:
73128633
Test: m Camera2
Change-Id: I97fa2e3b036ea950c231f13d987a5d1e83308721
Bill Yi [Sat, 3 Feb 2018 16:30:42 +0000 (08:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I94e0da72cb78773ae27ac0225496ac2336dc3f3b
Auto-generated-cl: translation import
Bill Yi [Sat, 27 Jan 2018 17:20:38 +0000 (17:20 +0000)]
Import translations. DO NOT MERGE am:
7234404ed3 -s ours
am:
92ce98aaee -s ours
Change-Id: Ibcb4ef2dc5ee80c274adb7238d8bdd82da4f529a
Bill Yi [Sat, 27 Jan 2018 17:18:18 +0000 (17:18 +0000)]
Import translations. DO NOT MERGE
am:
7234404ed3 -s ours
Change-Id: I3bbffffdcf0bf8757d2e329bd70395d8d512a356
Bill Yi [Sat, 27 Jan 2018 13:28:23 +0000 (05:28 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iaeaa7571a045b4356c454708d360ee520e253bc1
Bill Yi [Sat, 27 Jan 2018 13:27:26 +0000 (05:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfe2e70fcd15e39482c2fcf45820cfe0bbb7e1fb
Auto-generated-cl: translation import
Bill Yi [Fri, 19 Jan 2018 08:53:46 +0000 (00:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibc4f209e051175156a80f83f792aeb3fa5476e19
Auto-generated-cl: translation import
Bill Yi [Wed, 10 Jan 2018 17:06:49 +0000 (09:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2d7650a575455f650e160caa1fb3ba4794a565cc
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 8 Dec 2017 05:11:57 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Xin Li [Fri, 8 Dec 2017 04:52:16 +0000 (04:52 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
0658146997 -s ours am:
6e2c1bdca4
am:
acbb99ada0 -s ours
Change-Id: I3fe6e85562e0b62e1c3f81fe63562843c69c2a76
Bill Yi [Fri, 8 Dec 2017 01:10:12 +0000 (17:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie6fa093f248262c559496845879e08e6066fe5cb
Auto-generated-cl: translation import
Stephen Li [Thu, 7 Dec 2017 23:44:38 +0000 (23:44 +0000)]
Manually merge changes from giant AOSP topic
Change-Id: Ib8f588ebe08bac8b557793127a6eea042cf2a653
Xin Li [Thu, 7 Dec 2017 12:56:41 +0000 (12:56 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
0658146997 -s ours
am:
6e2c1bdca4
Change-Id: If4d6ac81a29e6adbc09ecd96fd3b565603251032
Xin Li [Thu, 7 Dec 2017 12:52:00 +0000 (12:52 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
0658146997 -s ours
Change-Id: I5aff9abe8f04dbd5217255de33ae7eebbb5b03bc
Xin Li [Thu, 7 Dec 2017 06:52:11 +0000 (06:52 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
53e928cde7 -s ours
am:
bc5992d659
Change-Id: If0ab1e9b8eec4a303ffa3608741519403da0e3e5
Xin Li [Thu, 7 Dec 2017 04:23:56 +0000 (04:23 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
53e928cde7 -s ours
Change-Id: Idfac165fa00fc76408d4b0c98fc3e398bb0fc91d
Xin Li [Wed, 6 Dec 2017 23:18:29 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:05 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I2c87f970e53f32486e748642691c6d7231e46548
Bill Yi [Thu, 30 Nov 2017 01:52:48 +0000 (01:52 +0000)]
Import translations. DO NOT MERGE am:
7ebc83533a -s ours
am:
17a8d4b80d -s ours
Change-Id: Ib01b4ecc12d07fcad75aa384530092673db57ee7
Bill Yi [Thu, 30 Nov 2017 01:45:41 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
7ebc83533a -s ours
Change-Id: I95a1766e8612597b5d37535747cc61e4f23e8fc0
Bill Yi [Thu, 30 Nov 2017 00:02:29 +0000 (16:02 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I8f2b26860d2d68700c357e66e566d929ebee09f4
TreeHugger Robot [Mon, 20 Nov 2017 21:45:12 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 20 Nov 2017 19:42:35 +0000 (11:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7f1d412558943798c62a41fd0216ca8333707411
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 15 Nov 2017 03:08:29 +0000 (03:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Xin Li [Wed, 15 Nov 2017 02:25:58 +0000 (02:25 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
f95fefd3a8
Change-Id: I8271c99137610c9c114537ad6a06666eb37b5ef7
Xin Li [Wed, 15 Nov 2017 00:38:21 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: Ib06ebe440487ee913d5670c55300b75f5f2c8323
Bill Yi [Tue, 14 Nov 2017 20:56:09 +0000 (12:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie36b5d4eefb9d8e6ffcd2b3316c292a56f9a376b
Auto-generated-cl: translation import
Xin Li [Mon, 13 Nov 2017 22:35:41 +0000 (14:35 -0800)]
Merge commit '
e088d4b48e74646a148b6839fb5cf0e78dcd40d4' into HEAD
Change-Id: I2d5709acb94525894558f9c8ca8230197dd8eaf3
OSDN Git Service
