OSDN Git Service

android-x86/packages-apps-Gallery2.git
5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 4 Aug 2018 14:20:21 +0000 (07:20 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 36d0f3141d  -s ours

Change-Id: Ic18ff5a653501f7537b3c4eb053103fef2c9b9a5

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 4 Aug 2018 12:25:54 +0000 (05:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1c17bbf576ffe78d543115068d289c2d3d3718f7
Auto-generated-cl: translation import

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Mon, 11 Jun 2018 18:14:20 +0000 (11:14 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: eb9c436e05  -s ours

Change-Id: I2301f3720bfbde339c8cdc51b8f31cb6a83b1cf4

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 9 Jun 2018 17:53:59 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ieea937ca6017eafa4945b7f7b73f789a14166ef5

5 years agoMerge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Xin Li [Sat, 9 Jun 2018 10:13:44 +0000 (03:13 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: d97beba789

Change-Id: Ib683e84842c6d6899f08756bce932c69374f9f5e

5 years agoMerge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Xin Li [Fri, 8 Jun 2018 18:08:00 +0000 (11:08 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: Id6fa79ad43862c576599c72ee5b995104e68de0d

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Thu, 24 May 2018 23:56:51 +0000 (16:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 742282346a  -s ours

Change-Id: Ic217b48d7893869967fb5f6deb3aa13602b72aff

5 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 May 2018 19:06:18 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idcc558b44475b856b19294c26e719a6fc0ac6a77

5 years ago[automerger skipped] Merge "Move Gallery2 over to AAPT2 and new v4 modules" am: 28139...
Colin Cross [Mon, 7 May 2018 20:34:43 +0000 (13:34 -0700)]
[automerger skipped] Merge "Move Gallery2 over to AAPT2 and new v4 modules" am: 2813902e4e
am: 2324f6d428  -s ours

Change-Id: I5e1792e11ce2bc2e7db1bcefc5b5eff48acb00ba

5 years agoMerge "Move Gallery2 over to AAPT2 and new v4 modules"
Colin Cross [Mon, 7 May 2018 19:31:53 +0000 (12:31 -0700)]
Merge "Move Gallery2 over to AAPT2 and new v4 modules"
am: 2813902e4e

Change-Id: If3fc0641e1b6bf319936f451a85f112ef0c61769

5 years agoMerge "Move Gallery2 over to AAPT2 and new v4 modules"
Colin Cross [Mon, 7 May 2018 17:53:09 +0000 (17:53 +0000)]
Merge "Move Gallery2 over to AAPT2 and new v4 modules"

6 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 28 Apr 2018 05:01:26 +0000 (22:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 2c756ae525  -s ours

Change-Id: Iee33301222f501bffd89c5e3e03490ca405b71ea

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 28 Apr 2018 03:05:08 +0000 (20:05 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8928a7b30341c042d58a3c3c3bf468b07f515074

6 years agoMove Gallery2 over to AAPT2 and new v4 modules
Colin Cross [Mon, 25 Sep 2017 20:40:55 +0000 (13:40 -0700)]
Move Gallery2 over to AAPT2 and new v4 modules

Bug: 35994894
Test: make
Change-Id: I00cacda9dc8dc9ac919958cc7a8bd432680b85d7
Merged-In: I00cacda9dc8dc9ac919958cc7a8bd432680b85d7
(cherry picked from commit 86f481b8aea757cded9c2179dd5298b291de5e73)

6 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 7 Apr 2018 03:38:34 +0000 (20:38 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 8d0074b5e5  -s ours

Change-Id: I89a561edb5836a3df2dd6195241eb82417554247

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 6 Apr 2018 17:54:52 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7c4761a76fdb9c6f614f1b117bc3d2e38ed7565f

6 years agoMerge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev
Jiyong Park [Thu, 5 Apr 2018 18:13:12 +0000 (11:13 -0700)]
Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev
am: ab8fa0fe17

Change-Id: Idd42be792d62842226324e120f67cada714c0fdc

6 years agoMerge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 17:53:51 +0000 (17:53 +0000)]
Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev

6 years agoRename android.utils.Pools to com.android.photos.util.Pools
Jiyong Park [Thu, 5 Apr 2018 07:12:39 +0000 (16:12 +0900)]
Rename android.utils.Pools to com.android.photos.util.Pools

android.utils.Pools is a class copied from frameworks/base. It was
copied because the framework one has been marked as @hide. This caused
the class to be duplicated into the Gallery2 apk and the boot classpath.
At run-time, the class from bootclasspath was used because the
classloader tries to load a class from the parent class loader first.

However, this combined with the recent activation of the kill-switch
caused a runtime error. Working around the issue by renaming the class
copied into the app so that it does not collide with the
framework-defined one.

Bug: 77544391
Test: build aosp_walleye. Take a video and see it via the Gallery2.
The app does not crash.

Change-Id: Ia0af4da84242044da2e0ab63e38df243d9769418

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 19:53:33 +0000 (19:53 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 915d04b422  -s ours

Change-Id: I4db6d4eebb8f490a08cfbfcd615818c180e4060f

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 15:41:16 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 2 Apr 2018 06:07:12 +0000 (23:07 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I069ba4d8e9ed5ee1b53c1168df08ba26341ecf31

6 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 04:04:10 +0000 (04:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE
am: bb9b24fdcb  -s ours

Change-Id: I727e12f4c18c7f6ad5f4f2e6622d8b4186bd68f4

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Mar 2018 23:54:54 +0000 (16:54 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ibb87be0ac02ded8777d55f0a5aaf1ce4c6531b6e

6 years agoMerge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev
Aurimas Liutikas [Fri, 30 Mar 2018 17:19:43 +0000 (17:19 +0000)]
Merge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev
am: 505243ef35

Change-Id: If7793e2bd02074b6daae298b735bce77ff554e49

6 years agoMerge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev
Aurimas Liutikas [Fri, 30 Mar 2018 13:48:46 +0000 (13:48 +0000)]
Merge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev

6 years agoRevert "Revert "Move Gallery2 to androidx.""
Aurimas Liutikas [Thu, 29 Mar 2018 19:39:49 +0000 (19:39 +0000)]
Revert "Revert "Move Gallery2 to androidx.""

This reverts commit fac21a096afbe8eb517726cf4f9f093eade87ddc.

We can reland this change now that prebuilts/sdk has been updated with the new SDK. (ag/3818779)

Bug: 76692459
Change-Id: I73f2ed3d61bc8756d1b7e4ea0e54c58227d5d506

6 years agoMerge "Revert "Move Gallery2 to androidx."" into pi-dev
Aurimas Liutikas [Thu, 29 Mar 2018 18:23:30 +0000 (18:23 +0000)]
Merge "Revert "Move Gallery2 to androidx."" into pi-dev
am: f2f4b814b2

Change-Id: I2d98e71d09ecf1068be60493cebface5dafa55cb

6 years agoMerge "Revert "Move Gallery2 to androidx."" into pi-dev
Aurimas Liutikas [Thu, 29 Mar 2018 17:51:17 +0000 (17:51 +0000)]
Merge "Revert "Move Gallery2 to androidx."" into pi-dev

6 years agoRevert "Move Gallery2 to androidx."
Aurimas Liutikas [Thu, 29 Mar 2018 17:50:33 +0000 (17:50 +0000)]
Revert "Move Gallery2 to androidx."

This reverts commit c86745dd27fb93baa1ec22796bb4af207b6b6182.

Broke apps target build.

Bug: 76692459
Change-Id: I7b3529a9584d72a31b6c16ff4d4155f75d1c57f8

6 years agoMerge "Move Gallery2 to androidx." into pi-dev
Aurimas Liutikas [Thu, 29 Mar 2018 17:45:54 +0000 (17:45 +0000)]
Merge "Move Gallery2 to androidx." into pi-dev
am: 0093dbfb7e

Change-Id: I7548d185f7bb9b09a4ccd2de97e4115c535ed5e7

6 years agoMerge "Move Gallery2 to androidx." into pi-dev
Aurimas Liutikas [Thu, 29 Mar 2018 17:07:41 +0000 (17:07 +0000)]
Merge "Move Gallery2 to androidx." into pi-dev

6 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Thu, 29 Mar 2018 15:05:13 +0000 (15:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE
am: d0b006d0c3  -s ours

Change-Id: I8a345a6ab725c0607254902bbcd0a2e95758a77f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Mar 2018 01:03:28 +0000 (18:03 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6e8f7f82f201970324bb4ab4b377c65adfa2c2cf

6 years agoMove Gallery2 to androidx.
Aurimas Liutikas [Wed, 28 Mar 2018 18:45:44 +0000 (11:45 -0700)]
Move Gallery2 to androidx.

Bug: 76692459
Test: make -j Gallery2 and run on emulator
Change-Id: Ife6a5649c21464f404db3198bd6a4ba8aa901ee8

6 years agoImport translations. DO NOT MERGE am: 661db9ffb1 -s ours
Bill Yi [Sat, 3 Mar 2018 13:30:06 +0000 (13:30 +0000)]
Import translations. DO NOT MERGE am: 661db9ffb1  -s ours
am: 1608c9536c  -s ours

Change-Id: I1f3b6ee3ce978b40ea5b522bddfe946b551f5c13

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 3 Mar 2018 13:26:07 +0000 (13:26 +0000)]
Import translations. DO NOT MERGE
am: 661db9ffb1  -s ours

Change-Id: I7743a66a3d9672beda62c8d7d40d12c1c39a02d0

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 2 Mar 2018 21:54:49 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9 am: ae4d8c9a73
Andreas Gampe [Fri, 2 Mar 2018 16:48:46 +0000 (16:48 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9 am: ae4d8c9a73
am: c61338150e

Change-Id: I48ff76febe268de8af1b2ccfc8f582e9685f6209

6 years agoMerge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9
Andreas Gampe [Fri, 2 Mar 2018 16:42:13 +0000 (16:42 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9
am: ae4d8c9a73

Change-Id: Ic752304dc8191bf42eba98a7f7f64fd12b13f22d

6 years agoMerge "Gallery2: Fix CollectionIncompatibleType"
Andreas Gampe [Fri, 2 Mar 2018 16:35:39 +0000 (16:35 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType"
am: 7115c7cbf9

Change-Id: I2acf35452fea9973718f971af76dd0964f84423f

6 years agoMerge "Gallery2: Fix CollectionIncompatibleType"
Treehugger Robot [Fri, 2 Mar 2018 16:29:55 +0000 (16:29 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType"

6 years agoGallery2: Fix CollectionIncompatibleType
Andreas Gampe [Fri, 2 Mar 2018 01:42:59 +0000 (17:42 -0800)]
Gallery2: Fix CollectionIncompatibleType

Fix incorrect indexOf lookup.

Bug: 73288226
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ifb158d6f4c5f0eb078f9d4fb37c7da03c2c0a4fe

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 2 Mar 2018 01:20:59 +0000 (17:20 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7a4084ae93055c588726afffacb83ecb2402b407

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 2 Mar 2018 01:19:19 +0000 (17:19 -0800)]
Import translations. DO NOT MERGE

Change-Id: I278b784486ae848f4847a32297a10158610dd76f
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE am: aaae7c4987 -s ours
Bill Yi [Tue, 20 Feb 2018 18:16:19 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE am: aaae7c4987  -s ours
am: 37ebb54c54  -s ours

Change-Id: I4418c4cece2c5a88362949bfdfa8215146a406d5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 20 Feb 2018 18:08:56 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE
am: aaae7c4987  -s ours

Change-Id: Ic55f4873fd4814c22a6378c6c60718ae5ef1e95a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 20 Feb 2018 11:07:39 +0000 (03:07 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I15c259177a41f9ed7d0c6405e41f7cbd63915d2b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 20 Feb 2018 11:06:08 +0000 (03:06 -0800)]
Import translations. DO NOT MERGE

Change-Id: Icb415026064dce428e77746e4188f960de2df6a6
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 3 Feb 2018 16:30:52 +0000 (08:30 -0800)]
Import translations. DO NOT MERGE

Change-Id: I21468a80fc8433ef107a00654f26c2cc62e52977
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE am: 6bd249f96c -s ours
Bill Yi [Sat, 27 Jan 2018 17:26:17 +0000 (17:26 +0000)]
Import translations. DO NOT MERGE am: 6bd249f96c  -s ours
am: 29d4297673  -s ours

Change-Id: I9225ada19523c70ff0cbeaed0f328f53acd87d25

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 27 Jan 2018 17:23:17 +0000 (17:23 +0000)]
Import translations. DO NOT MERGE
am: 6bd249f96c  -s ours

Change-Id: I7ba817d4b1b50272c7feb948467f0c6d7110c718

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 27 Jan 2018 13:34:42 +0000 (05:34 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6419caadf5557a0522adf5bab6202daf45861aab

6 years agoMerge "Gallery2: Fix NaN comparisons" am: 6f8c54d224 am: 9ac972e9bc
Andreas Gampe [Tue, 23 Jan 2018 17:08:01 +0000 (17:08 +0000)]
Merge "Gallery2: Fix NaN comparisons" am: 6f8c54d224 am: 9ac972e9bc
am: 9e29df9dd4

Change-Id: I0db897b5532de596616002e0ca1be15cce684915

6 years agoMerge "Gallery2: Fix NaN comparisons" am: 6f8c54d224
Andreas Gampe [Tue, 23 Jan 2018 17:02:57 +0000 (17:02 +0000)]
Merge "Gallery2: Fix NaN comparisons" am: 6f8c54d224
am: 9ac972e9bc

Change-Id: I081c00f5e57adc883be2a1e8478cfa467d49166c

6 years agoMerge "Gallery2: Fix NaN comparisons"
Andreas Gampe [Tue, 23 Jan 2018 16:58:45 +0000 (16:58 +0000)]
Merge "Gallery2: Fix NaN comparisons"
am: 6f8c54d224

Change-Id: Iba67789fa694e0978370dbd0ad60c14bb8222be6

6 years agoMerge "Gallery2: Fix NaN comparisons"
Treehugger Robot [Tue, 23 Jan 2018 16:28:58 +0000 (16:28 +0000)]
Merge "Gallery2: Fix NaN comparisons"

6 years agoGallery2: Fix NaN comparisons
Andreas Gampe [Tue, 23 Jan 2018 05:24:48 +0000 (21:24 -0800)]
Gallery2: Fix NaN comparisons

Use Float.isNan for correct evaluation. Found by errorprone.

Test: m
Change-Id: I3d47a2a64059d9c89528c82a1ca766248db4bdf9

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 10 Jan 2018 17:09:57 +0000 (09:09 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1c4e79364350d4b459bf723b690a866ebe663fc0
Auto-generated-cl: translation import

6 years agoMerge "Move from stlport to libc++." am: 6924e012fd am: 268c9153a3
Dan Albert [Mon, 8 Jan 2018 21:43:12 +0000 (21:43 +0000)]
Merge "Move from stlport to libc++." am: 6924e012fd am: 268c9153a3
am: 0d9941f3db

Change-Id: I88e4a71238d6f6e0d20c1c36b19d464202022479

6 years agoMerge "Move from stlport to libc++." am: 6924e012fd
Dan Albert [Mon, 8 Jan 2018 21:37:49 +0000 (21:37 +0000)]
Merge "Move from stlport to libc++." am: 6924e012fd
am: 268c9153a3

Change-Id: I9562c0830a863e8db6d83b1a6e1c03d5d3b0fadc

6 years agoMerge "Move from stlport to libc++."
Dan Albert [Sat, 6 Jan 2018 18:00:35 +0000 (18:00 +0000)]
Merge "Move from stlport to libc++."
am: 6924e012fd

Change-Id: I609e738ed6ea191c2c926dc3ade190c652726d20

6 years agoMerge "Move from stlport to libc++."
Treehugger Robot [Fri, 5 Jan 2018 22:15:06 +0000 (22:15 +0000)]
Merge "Move from stlport to libc++."

6 years agoMove from stlport to libc++.
Dan Albert [Fri, 5 Jan 2018 19:09:51 +0000 (11:09 -0800)]
Move from stlport to libc++.

Test: make checkbuild
Bug: None
Change-Id: I6966984d1eab477a209a5d267a518c5917dabd42

6 years agoMove Gallery2 over to AAPT2 and new v4 modules
Alan Viverette [Mon, 11 Dec 2017 22:57:32 +0000 (17:57 -0500)]
Move Gallery2 over to AAPT2 and new v4 modules

Bug: 35994894
Test: make
Change-Id: I00cacda9dc8dc9ac919958cc7a8bd432680b85d7

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753 -s ours am: edb2373362
Xin Li [Fri, 8 Dec 2017 04:38:46 +0000 (04:38 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753  -s ours am: edb2373362
am: 6ab6e15c95  -s ours

Change-Id: I9cd784500a3dfc6e3b40751840a95fda3a2ba632

6 years agoDO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9 -s ours am: 3b441660e8
Xin Li [Thu, 7 Dec 2017 21:34:34 +0000 (21:34 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9  -s ours am: 3b441660e8
am: ea0cde1302  -s ours

Change-Id: I2f6f5a1a9bd7d7cfec92539c7a8cc2f9b5185683

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753 -s ours
Xin Li [Thu, 7 Dec 2017 13:37:53 +0000 (13:37 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753  -s ours
am: edb2373362

Change-Id: I3be76a44c0308df386d284dfca0022dc7fd890b6

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Thu, 7 Dec 2017 13:34:53 +0000 (13:34 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 350f920753  -s ours

Change-Id: I1d1810f26265cd93343e8fa09ea7bfc4744581fb

6 years agoDO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9 -s ours
Xin Li [Thu, 7 Dec 2017 07:01:14 +0000 (07:01 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9  -s ours
am: 3b441660e8

Change-Id: Ibaa570574d94d53a31c8f04447b5c658a5203899

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Thu, 7 Dec 2017 04:32:52 +0000 (04:32 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am: 4e0c4861f9  -s ours

Change-Id: I0131132b59eb621fc272d31c51b1fc6ab9d91a2a

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 23:18:30 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Wed, 6 Dec 2017 19:52:08 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I02acbb1837baccf6537a0e2d7cafcfdf053ef3ca

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Dec 2017 06:15:17 +0000 (22:15 -0800)]
Import translations. DO NOT MERGE

Change-Id: If0f5f6428a44689048da16d2844434fca098f6ae
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE am: b0d5c3ef71 -s ours
Bill Yi [Thu, 30 Nov 2017 01:55:53 +0000 (01:55 +0000)]
Import translations. DO NOT MERGE am: b0d5c3ef71  -s ours
am: 1de15fa587  -s ours

Change-Id: Iafd2ca284b37da3bc9c88bbe9f28f9b5ce979fab

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 01:47:05 +0000 (01:47 +0000)]
Import translations. DO NOT MERGE
am: b0d5c3ef71  -s ours

Change-Id: Icad712b1ee9f1282264754f42fbf2acfe0f5e45e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 00:05:36 +0000 (16:05 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I9ccf023b651d9b891d148f75abcefc39265fa7a9

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 20 Nov 2017 21:28:34 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:43:57 +0000 (11:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: I020947cba5c9b06b250f97a73d2821fb4d884e5c
Auto-generated-cl: translation import

6 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Xin Li [Wed, 15 Nov 2017 02:12:41 +0000 (02:12 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: f4015395a8

Change-Id: Ib42faf5cb6c015927434dcaf3367882a859c46f2

6 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Xin Li [Wed, 15 Nov 2017 00:38:22 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I8d0a6b7edb32c8a300bce902df909395f61f4373

6 years agoMerge commit '9c045e49152040db37c827c238bbb7a4400bec1e' into HEAD
Xin Li [Mon, 13 Nov 2017 22:35:42 +0000 (14:35 -0800)]
Merge commit '9c045e49152040db37c827c238bbb7a4400bec1e' into HEAD

Change-Id: Ia58699cd527c0851868f948e4aa2def40f15223c

6 years agoMerge "Use -Werror in packages/apps/Gallery2" am: 24309021fb am: 5b7d5244e9
Chih-hung Hsieh [Fri, 3 Nov 2017 00:53:07 +0000 (00:53 +0000)]
Merge "Use -Werror in packages/apps/Gallery2" am: 24309021fb am: 5b7d5244e9
am: ce684cfa6c

Change-Id: Ic07c2a734f0a634458d3c9e50b5877209434ef51

6 years agoMerge "Use -Werror in packages/apps/Gallery2" am: 24309021fb
Chih-hung Hsieh [Fri, 3 Nov 2017 00:49:34 +0000 (00:49 +0000)]
Merge "Use -Werror in packages/apps/Gallery2" am: 24309021fb
am: 5b7d5244e9

Change-Id: Ie45c3b38637a28be789d318c3c740c782f2131f2

6 years agoMerge "Use -Werror in packages/apps/Gallery2"
Chih-hung Hsieh [Fri, 3 Nov 2017 00:47:09 +0000 (00:47 +0000)]
Merge "Use -Werror in packages/apps/Gallery2"
am: 24309021fb

Change-Id: Iee490c18f1d60f20ba19e304614c01fe481ff0d8

6 years agoMerge "Use -Werror in packages/apps/Gallery2"
Chih-hung Hsieh [Fri, 3 Nov 2017 00:45:35 +0000 (00:45 +0000)]
Merge "Use -Werror in packages/apps/Gallery2"

6 years agoUse -Werror in packages/apps/Gallery2
Chih-Hung Hsieh [Thu, 2 Nov 2017 17:24:36 +0000 (10:24 -0700)]
Use -Werror in packages/apps/Gallery2

* Keep constant-conversion warnings to fix later.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ib93e954e025fd2f0202960df20583b50b97fce7f

6 years agoImport translations. DO NOT MERGE am: ea2a43b6e8 -s ours am: 88b7063652 -s ours
Bill Yi [Fri, 20 Oct 2017 17:43:36 +0000 (17:43 +0000)]
Import translations. DO NOT MERGE am: ea2a43b6e8  -s ours am: 88b7063652  -s ours
am: ebc9696ac4  -s ours

Change-Id: Ia39f46a1548d505e872b0860283b242fba4fda57

6 years agoImport translations. DO NOT MERGE am: ea2a43b6e8 -s ours
Bill Yi [Fri, 20 Oct 2017 17:13:29 +0000 (17:13 +0000)]
Import translations. DO NOT MERGE am: ea2a43b6e8  -s ours
am: 88b7063652  -s ours

Change-Id: I437b0ff577a3bae4d3df931a0d7955c84811adad

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 16:37:57 +0000 (16:37 +0000)]
Import translations. DO NOT MERGE
am: ea2a43b6e8  -s ours

Change-Id: Id907dec92e7cd33035e0695010b8bbc016cc375a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 08:17:10 +0000 (01:17 -0700)]
Import translations. DO NOT MERGE

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

Bug: 68003463
Change-Id: I15f53f564cf5f783d6b8c8c8b44e2494392be612

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours am: 21391848ee -s ours
Bill Yi [Tue, 17 Oct 2017 09:14:34 +0000 (09:14 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours am: 21391848ee  -s ours
am: 9c045e4915  -s ours

Change-Id: Icc2fe0a4c3d03a3a46133bc8aaf6e7464b7252a2

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours am: ee12640ce1 -s ours
Bill Yi [Tue, 17 Oct 2017 09:14:23 +0000 (09:14 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours am: ee12640ce1  -s ours
am: 0c29f659b4  -s ours

Change-Id: I75ac8030007d071ce57a46e427e669d3babc72e0

6 years agoImport translations. DO NOT MERGE am: 3739f191c2 -s ours
Bill Yi [Tue, 17 Oct 2017 09:14:11 +0000 (09:14 +0000)]
Import translations. DO NOT MERGE am: 3739f191c2  -s ours
am: cd341ba7dd  -s ours

Change-Id: Idb51f0fbc0a25421f148d574b9498702e50f12e0

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours
Bill Yi [Tue, 17 Oct 2017 05:38:47 +0000 (05:38 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours
am: 21391848ee  -s ours

Change-Id: I3294299d838ad88536770d543478cdc80dd24a54

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours
Bill Yi [Tue, 17 Oct 2017 03:34:10 +0000 (03:34 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours
am: ee12640ce1  -s ours

Change-Id: I23c2a27af9c198036acb7e1341813e4845242f4c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 03:33:57 +0000 (03:33 +0000)]
Import translations. DO NOT MERGE
am: 3739f191c2  -s ours

Change-Id: Ie1a5d3a490623dca3927b67ba1c8987bff818de9

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 02:19:26 +0000 (02:19 +0000)]
Import translations. DO NOT MERGE
am: 7367f4e5a3  -s ours

Change-Id: I7dbfbb757a7cba4e52d980cd3da96da0339628f5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 02:08:52 +0000 (02:08 +0000)]
Import translations. DO NOT MERGE
am: 7367f4e5a3  -s ours

Change-Id: I5a557b021286b4f2ebe2fc9c934c56aeabe59c70

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Oct 2017 07:06:29 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE

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

Bug: 64712476
Change-Id: I5280cc386023aa6e501dfb2b822341a5491726c6