git.osdn.net Git - android-x86/packages-apps-Camera2.git/log

Chih-Wei Huang [Thu, 10 Nov 2016 05:42:43 +0000 (13:42 +0800)]

Change default video quality to medium

android-build-team Robot [Thu, 31 May 2018 07:26:01 +0000 (07:26 +0000)]

Snap for 4813226 from b49660ac79ab178884160d3ec00865d093444a0e to pi-release

Change-Id: I898e61ecc5cd58c826ad6293eb065b723573a2f2

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 27 May 2018 07:20:41 +0000 (07:20 +0000)]

Snap for 4807121 from 6e9b71e1d712c89553d170c3e935557a1e6ba82c to pi-release

Change-Id: I82b3ae9684a4ac466309cd23b2ffbaccf75621d3

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Wed, 23 May 2018 07:21:59 +0000 (07:21 +0000)]

Snap for 4799153 from 92f1a41bc36398b5e33f722bb34139e9c8d58f98 to pi-release

Change-Id: Id7bc191c85fb7d2055091935de0689dfde18b7d3

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Mon, 21 May 2018 07:23:55 +0000 (07:23 +0000)]

Snap for 4793706 from e9a2e68f3bc907db71a196a0b1e709832092f3a3 to pi-release

Change-Id: I95a5ee45871779800f5f9f13909df872bb212764

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 13 May 2018 07:24:44 +0000 (07:24 +0000)]

Snap for 4778776 from 333844ee5a7ea34029827908d648380b363c9242 to pi-release

Change-Id: I195223886f4d607701d163a8df7ee773c4bad934

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 29 Apr 2018 07:23:34 +0000 (07:23 +0000)]

Snap for 4751833 from 7a4bca245128a407ab5d958bf6f352d8f45181e3 to pi-release

Change-Id: I6f21b4eeb12f042dff4293ce92a061ed766c861c

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Wed, 18 Apr 2018 07:25:34 +0000 (07:25 +0000)]

Snap for 4728508 from d0751716b45dd4cc9c977d1a3454c4036c7c801e to pi-release

Change-Id: I04ee05f2902630dd2c2396dee33c49a3e81d92e5

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 15 Apr 2018 07:26:44 +0000 (07:26 +0000)]

Snap for 4722539 from deb1c90c99e2a37ad33fa20cb1c3811bb027fc5b to pi-release

Change-Id: Ifc907befc85d46ececc7395bd20155f26d645c86

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 8 Apr 2018 07:26:18 +0000 (07:26 +0000)]

Snap for 4706961 from 2fce5c92a8561578e360d080ee0891943d72768c to pi-release

Change-Id: I4104d4c25043d90c5792a2cfa45818367a58769e

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 1 Apr 2018 07:21:57 +0000 (07:21 +0000)]

Snap for 4693621 from a2c5a111c6e927fa9cc0b4db8f90259f16aad57b to pi-release

Change-Id: I04312f4b9197073273b1c1108625a3b3581022dc

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 11 Mar 2018 08:24:17 +0000 (08:24 +0000)]

Snap for 4647811 from 7ccd89ab8139405c0f3a9847690f6a2120100de9 to pi-release

Change-Id: Ie59c06c9921558d6af40bf34c7a358f1c35a6257

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 4 Mar 2018 08:21:29 +0000 (08:21 +0000)]

Snap for 4632767 from bf127c88621cb56ec1cc1d89f5b76d51a38cf91f to pi-release

Change-Id: I423a781d4aea076d24e91749aa2abfa7aedf30fc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 21:44:14 +0000 (21:44 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Tue, 27 Feb 2018 08:24:52 +0000 (08:24 +0000)]

Snap for 4623514 from 5a6156a44f4de4fc221722c665af6af4dd10b1e6 to pi-release

Change-Id: Ie13e4eea9d9dcfcd2f754d8aeafa301dff663e35

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Thu, 22 Feb 2018 08:24:41 +0000 (08:24 +0000)]

Snap for 4615953 from 14ef56b8d0c2e26c939bf922dab5adb8610da3ad to pi-release

Change-Id: I844ba90cd21d28604e5879a5aeaf455656276c87

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Feb 2018 04:55:41 +0000 (04:55 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 22 Feb 2018 02:07:15 +0000 (02:07 +0000)]

Merge "Use HAS_BUILD_NUMBER to check engineering build"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Wed, 21 Feb 2018 08:22:56 +0000 (08:22 +0000)]

Snap for 4613997 from 75f0f3c9a5bd103ffbd6dff5d3f640192938071c to pi-release

Change-Id: I7aa8d5101428bc52a19989d62723263b84848abb

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 22:46:17 +0000 (22:46 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Sun, 11 Feb 2018 08:22:34 +0000 (08:22 +0000)]

Snap for 4598635 from be148be690e159c0fd85f3da13bb96fd8084f084 to pi-release

Change-Id: I27c8b747d4ac984c67fb55f83efca7bfbbd35388

commit | commitdiff | tree

Alan Viverette [Thu, 8 Feb 2018 22:19:40 +0000 (17:19 -0500)]

Migrate to AAPT2

Bug: 73128633
Test: m Camera2
Change-Id: I97fa2e3b036ea950c231f13d987a5d1e83308721

commit | commitdiff | tree

android-build-team Robot [Mon, 5 Feb 2018 08:21:45 +0000 (08:21 +0000)]

Snap for 4585119 from 67610909a1208325a098a5d97c806f251e58e867 to pi-release

Change-Id: I125e103ae678ef4c8f7f1a39e84908455a4f2d0c

commit | commitdiff | tree

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

commit | commitdiff | tree

gitbuildkicker [Mon, 29 Jan 2018 22:54:49 +0000 (14:54 -0800)]

merge in pi-release history after reset to master

commit | commitdiff | tree

gitbuildkicker [Mon, 29 Jan 2018 19:55:34 +0000 (11:55 -0800)]

merge in pi-release history after reset to master

commit | commitdiff | tree

android-build-team Robot [Sun, 28 Jan 2018 08:27:11 +0000 (08:27 +0000)]

Snap for 4571561 from 97f95579a6fd400a18d4517b2281dae73e9c6402 to pi-release

Change-Id: Ibb5a8ccfd913de748c3e1ab6447e41ff8f985a6d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

gitbuildkicker [Tue, 23 Jan 2018 06:26:27 +0000 (22:26 -0800)]

merge in pi-release history after reset to master

commit | commitdiff | tree

gitbuildkicker [Tue, 23 Jan 2018 00:05:28 +0000 (16:05 -0800)]

merge in pi-release history after reset to master

commit | commitdiff | tree

android-build-team Robot [Sun, 21 Jan 2018 08:26:13 +0000 (08:26 +0000)]

Snap for 4557233 from fd715184738873e7c6442c083d7ce3ae4be299e8 to pi-release

Change-Id: I3bcc448d5911f3526e6af4d852954824ce585ce6

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Thu, 11 Jan 2018 09:23:55 +0000 (09:23 +0000)]

Snap for 4539010 from 2b32f80673324f771d06cadf32b37817407cac18 to pi-release

Change-Id: Iad3a80e6102c5cf56fb44cb422d04104eec4c934

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Mon, 11 Dec 2017 12:23:35 +0000 (12:23 +0000)]

Snap for 4496165 from 22f2fe4b5e9a8e3533cf29d8142f3417c9e55107 to pi-release

Change-Id: Id145fa5b772ea5357ca1ee0a2600a707da76fdf9

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Dec 2017 05:11:57 +0000 (05:11 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stephen Li [Thu, 7 Dec 2017 23:44:38 +0000 (23:44 +0000)]

Manually merge changes from giant AOSP topic

Change-Id: Ib8f588ebe08bac8b557793127a6eea042cf2a653

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Xin Li [Wed, 6 Dec 2017 23:18:29 +0000 (23:18 +0000)]

Merge "DO NOT MERGE: Merge Oreo MR1 into master"

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Thu, 30 Nov 2017 08:49:11 +0000 (08:49 +0000)]

Snap for 4476081 from 26d80a617e521628b22fdf99517e08f01eecbdbe to pi-release

Change-Id: Ic2a762135c231836f83f6d79f7ae30adff63e792

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Tue, 21 Nov 2017 08:20:38 +0000 (08:20 +0000)]

Snap for 4462748 from d1b7d3f18984f5159506a5c6c425f5d5f508b218 to pi-release

Change-Id: Ied32ba9070441d6155dfc5a89e8b84712e9827d6

commit | commitdiff | tree

TreeHugger Robot [Mon, 20 Nov 2017 21:45:12 +0000 (21:45 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

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

commit | commitdiff | tree

android-build-team Robot [Wed, 15 Nov 2017 08:42:51 +0000 (08:42 +0000)]

Snap for 4453288 from 9a56af3fb06677c6f63be1714933757327659572 to pi-release

Change-Id: I026db440d524feee6eec348d103e305dd61fe967

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Nov 2017 03:08:29 +0000 (03:08 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Xin Li [Mon, 13 Nov 2017 22:35:41 +0000 (14:35 -0800)]

Merge commit 'e088d4b48e74646a148b6839fb5cf0e78dcd40d4' into HEAD

Change-Id: I2d5709acb94525894558f9c8ca8230197dd8eaf3

commit | commitdiff | tree

android-build-team Robot [Tue, 31 Oct 2017 08:11:02 +0000 (08:11 +0000)]

Snap for 4425573 from 8e972cfbef5fed015ce7328034c62215aeb151b0 to pi-release

Change-Id: I00fde41534490e8ac583b3d0f9a3f772c4c4d861

commit | commitdiff | tree

Bill Yi [Mon, 30 Oct 2017 07:50:10 +0000 (07:50 +0000)]

Import translations. DO NOT MERGE am: 22125898d7 -s ours
am: ce460aa7fb -s ours

Change-Id: I361f31ab3b35ca8976917a1ac6e21814017ab2c4

commit | commitdiff | tree

Bill Yi [Mon, 30 Oct 2017 07:33:12 +0000 (07:33 +0000)]

Import translations. DO NOT MERGE
am: 22125898d7 -s ours

Change-Id: Ibd8092b0fc3d1854f4961df4a9e1519c7f362772

commit | commitdiff | tree

android-build-team Robot [Sun, 29 Oct 2017 08:02:16 +0000 (08:02 +0000)]

Snap for 4422293 from 19b7b21e989dc802a7bc4594a38d421953d33912 to pi-release

Change-Id: I5d72766b68b3a0a424e306557786f55ab41e0621

commit | commitdiff | tree

Bill Yi [Sun, 29 Oct 2017 07:37:38 +0000 (00:37 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I4b2ef70e99e3c0333b7f097292e280eff6ea4f77

commit | commitdiff | tree

Bill Yi [Fri, 27 Oct 2017 08:01:01 +0000 (01:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: I65d2c29d4cbea06208a4a41c2a88a4ea3ad42cb5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

android-build-team Robot [Sat, 21 Oct 2017 08:09:32 +0000 (08:09 +0000)]

Snap for 4410151 from c393850680548e47c778ceefcf9a9e03c4b5b95a to pi-release

Change-Id: I128b6c2a52a0cb375d54c98d9a0035090add4c58

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:41:14 +0000 (17:41 +0000)]

Import translations. DO NOT MERGE am: 867c2a333b -s ours am: 3ef7cf5ae8 -s ours
am: f3e460ed8f -s ours

Change-Id: I4adb14d65864c39deeec106919f60242757e6518

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:11:13 +0000 (17:11 +0000)]

Import translations. DO NOT MERGE am: 867c2a333b -s ours
am: 3ef7cf5ae8 -s ours

Change-Id: I77523bdc53a64115146d2fd099a58c389ef2e716

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:36:22 +0000 (16:36 +0000)]

Import translations. DO NOT MERGE
am: 867c2a333b -s ours

Change-Id: I42c139c47c292dea7374d4d6c6a19ed3bf85cbe4

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 08:11:14 +0000 (01:11 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Idece2fc08294600d7f7c444506aab87ad435e224