OSDN Git Service
Anton Hansson [Mon, 14 Jan 2019 10:09:24 +0000 (02:09 -0800)]
Merge "Move Camera2 and its libs to /product" am:
a7f96bb3e7 am:
9383961480
am:
34b7f56538
Change-Id: I0f003e0b771d227cca63de8115e892a68bedc8ce
Anton Hansson [Mon, 14 Jan 2019 09:55:01 +0000 (01:55 -0800)]
Merge "Move Camera2 and its libs to /product" am:
a7f96bb3e7
am:
9383961480
Change-Id: Ie763bb6fc0d098754ce9cf5fbc0981910f74f118
Anton Hansson [Mon, 14 Jan 2019 09:39:35 +0000 (01:39 -0800)]
Merge "Move Camera2 and its libs to /product"
am:
a7f96bb3e7
Change-Id: Ifdbe0dce573a316f496d51c7d7ec73494c5dcfb4
Anton Hansson [Mon, 14 Jan 2019 09:09:03 +0000 (09:09 +0000)]
Merge "Move Camera2 and its libs to /product"
Anton Hansson [Fri, 11 Jan 2019 14:47:39 +0000 (14:47 +0000)]
Move Camera2 and its libs to /product
This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product along with
its jni libs.
Bug:
122353713
Test: launch camera on aosp_arm64 emulator
Change-Id: Ia6453e71cc93ea545f4ef3e9b609dff3f0e42243
Dan Willemsen [Thu, 10 Jan 2019 21:53:18 +0000 (13:53 -0800)]
Merge "Replace USER with BUILD_USERNAME" am:
072e9fe5bf am:
73a99f447e
am:
0c6bd93500
Change-Id: Ic9b01d4f9e50537a31f91c87fdb4feabaa544365
Dan Willemsen [Thu, 10 Jan 2019 21:48:09 +0000 (13:48 -0800)]
Merge "Replace USER with BUILD_USERNAME" am:
072e9fe5bf
am:
73a99f447e
Change-Id: I99757e8935f2091e2c1d3575d27bafa0b7961e58
Dan Willemsen [Thu, 10 Jan 2019 21:36:41 +0000 (13:36 -0800)]
Merge "Replace USER with BUILD_USERNAME"
am:
072e9fe5bf
Change-Id: Ieff7c94119f828c9e1e4f0e1d8cbcbc7225ccaff
Treehugger Robot [Thu, 10 Jan 2019 21:29:47 +0000 (21:29 +0000)]
Merge "Replace USER with BUILD_USERNAME"
Dan Willemsen [Wed, 2 Jan 2019 22:26:53 +0000 (14:26 -0800)]
Replace USER with BUILD_USERNAME
USER may be "nobody" if the build is sandboxed. BUILD_USERNAME will have
the original value in all cases.
Bug:
122270019
Test: none
Change-Id: Ie632c7fa7077ba225e9ad2e770ce9a7a7889552e
Raman Tenneti [Wed, 19 Dec 2018 08:47:59 +0000 (00:47 -0800)]
Merge "SYSTEM/app/Camera2/Camera2 app - update the version to target P (28) or higher." am:
ea0c1d2ce5 am:
98e4cfeaf2
am:
321c60b479
Change-Id: Iab28bf2c75da5a59fb6bea50587ebd130f7946c3
Raman Tenneti [Wed, 19 Dec 2018 08:37:36 +0000 (00:37 -0800)]
Merge "SYSTEM/app/Camera2/Camera2 app - update the version to target P (28) or higher." am:
ea0c1d2ce5
am:
98e4cfeaf2
Change-Id: Ieb8ffeed7b6c8d2e702d4b7b5f6cae581ae5c5b7
Raman Tenneti [Wed, 19 Dec 2018 08:21:53 +0000 (00:21 -0800)]
Merge "SYSTEM/app/Camera2/Camera2 app - update the version to target P (28) or higher."
am:
ea0c1d2ce5
Change-Id: Ie7a76e334b7f3a918ef9b4ef2e5bdba3b94a4acf
Treehugger Robot [Wed, 19 Dec 2018 04:07:28 +0000 (04:07 +0000)]
Merge "SYSTEM/app/Camera2/Camera2 app - update the version to target P (28) or higher."
Raman Tenneti [Tue, 18 Dec 2018 19:15:59 +0000 (11:15 -0800)]
SYSTEM/app/Camera2/Camera2 app - update the version to target P (28) or higher.
Bug:
119499874
Test: manual - Ran the following CTS tests on Pixel phone. Tested the messaging UI.
$ make -j 40
$ make Camera2Tests -j
$ ls -l out/target/product/marlin/system/app/Camera2/Camera2.apk
-rw-r--r-- 1 rtenneti primarygroup
6079575 Dec 5 18:29 out/target/product/marlin/system/app/Camera2/Camera2.apk
$ ls -l out/target/product/marlin/testcases/Camera2Tests/Camera2Tests.apk
-rw-r--r-- 1 rtenneti primarygroup
2679496 Dec 5 18:36 out/target/product/marlin/testcases/Camera2Tests/Camera2Tests.apk
$ adb install -r -d out/target/product/marlin/system/app/Camera2/Camera2.apk
$ ./development/testrunner/runtest.py --path cts/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
android.hardware.camera2.cts.CameraDeviceTest:
......................
Time: 140.026
OK (22 tests)
$ ./development/testrunner/runtest.py --path cts/tests/app/src/android/app/cts/SystemFeaturesTest.java
FAILURES!!!
Tests run: 14, Failures: 1
$ ./development/testrunner/runtest.py --path cts/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java
FAILURES!!!
Tests run: 22, Failures: 20
$ ./development/testrunner/runtest.py --path cts/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
android.hardware.camera2.cts.LogicalCameraDeviceTest:.....
Time: 2.484
OK (5 tests)
$ ./development/testrunner/runtest.py --path cts/tests/camera/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
FAILURES!!!
Tests run: 3, Failures: 1
$ ./development/testrunner/runtest.py --path cts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
$ ./development/testrunner/runtest.py --path cts/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
$ ./development/testrunner/runtest.py --path cts/tests/camera/src/android/hardware/camera2/cts/StaticMetadataTest.java
$ ./development/testrunner/runtest.py --path cts/hostsidetests/statsd/apps/statsdapp/src/com/android/server/cts/device/statsd/AtomTests.java
$ ./development/testrunner/runtest.py --path cts/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java
======================================
$ adb install -r -d out/target/product/marlin/testcases/Camera2Tests/Camera2Tests.apk
$ adb shell am instrument -w com.android.camera.tests
BEFORE
------
$ adb shell am instrument -w com.android.camera.tests/com.android.camera.stress.CameraStressTestRunner
Test results for CameraStressTestRunner=.E.E.E.E
Time: 0.041
FAILURES!!!
Tests run: 4, Failures: 0, Errors: 4
$ adb shell am instrument -w com.android.camera.tests/com.android.camera.CameraTestRunner
com.android.camera.unittest.CameraUnitTest:.
Test results for CameraTestRunner=.F.E.E.E.E.E.E.E.E.E.E.E.E.
Time: 1.939
FAILURES!!!
Tests run: 14, Failures: 1, Errors: 12
$ adb shell am instrument -w com.android.camera.tests/com.android.camera.exif.ExifTestRunner
INSTRUMENTATION_RESULT: shortMsg=Process crashed.
INSTRUMENTATION_CODE: 0
$ adb shell am instrument -w com.android.camera.tests/com.android.camera.jpegstream.JpegStreamTestRunner
INSTRUMENTATION_RESULT: shortMsg=Process crashed.
INSTRUMENTATION_CODE: 0
$ adb shell am instrument -w com.android.camera.tests/android.test.InstrumentationTestRunner
com.android.camera.functional.ImageCaptureIntentTest:INSTRUMENTATION_RESULT: shortMsg=Process crashed.
INSTRUMENTATION_CODE: 0
Change-Id: I9cce30572ec9fb253784fe157bf0fbaef386c89a
The Android Open Source Project [Fri, 7 Dec 2018 02:44:13 +0000 (18:44 -0800)]
[automerger skipped] Merge "DO NOT MERGE" am:
25a33ce5e7 -s ours am:
f64e2c9d7a -s ours
am:
f753a771b1 -s ours
Change-Id: I41a006e48072bbfa4a9715d167914e3f5fe1a6c3
The Android Open Source Project [Fri, 7 Dec 2018 02:21:33 +0000 (18:21 -0800)]
[automerger skipped] Merge "DO NOT MERGE" am:
25a33ce5e7 -s ours
am:
f64e2c9d7a -s ours
Change-Id: I6af95d244bcc685b60c28faf1223e4c67262e2e2
The Android Open Source Project [Fri, 7 Dec 2018 01:55:42 +0000 (17:55 -0800)]
[automerger skipped] Merge "DO NOT MERGE"
am:
25a33ce5e7 -s ours
Change-Id: I4b5e6cdc7e5b314b26c3eb26196c562ea852203a
Treehugger Robot [Fri, 7 Dec 2018 01:38:19 +0000 (01:38 +0000)]
Merge "DO NOT MERGE"
The Android Open Source Project [Thu, 6 Dec 2018 22:11:36 +0000 (14:11 -0800)]
DO NOT MERGE
Merge pie-platform-release (PPRL.181105.017, history only) into master
Bug:
118454372
Change-Id: I56ecf7b2d2401be103a0802bda92eaaf01769183
Ivan Lozano [Fri, 30 Nov 2018 08:42:46 +0000 (00:42 -0800)]
Merge "Disable XOM in libjni_jpegutil." am:
8976366652 am:
959da569e0
am:
24fc7e20e4
Change-Id: I5fe950d12e19fc9e581a780b1dda42cb52dfc415
Ivan Lozano [Fri, 30 Nov 2018 08:36:04 +0000 (00:36 -0800)]
Merge "Disable XOM in libjni_jpegutil." am:
8976366652
am:
959da569e0
Change-Id: Ia126e654f64ab8f73639e3a8abf6066b1d39c4df
Ivan Lozano [Fri, 30 Nov 2018 08:17:10 +0000 (00:17 -0800)]
Merge "Disable XOM in libjni_jpegutil."
am:
8976366652
Change-Id: Id12b00c639d83e039ad9b07d95285139e2457b88
Ivan Lozano [Fri, 30 Nov 2018 01:04:58 +0000 (01:04 +0000)]
Merge "Disable XOM in libjni_jpegutil."
Ivan Lozano [Thu, 29 Nov 2018 21:39:04 +0000 (13:39 -0800)]
Disable XOM in libjni_jpegutil.
Disable execute-only memory layouts in libjni_jpegutil.
This relies on libjpeg_static_ndk, which contains some data mixed into
code and thus requires a readable .text.
Bug:
77958880
Test: make -j libjni_jpegutil ENABLE_XOM=true
Test: readelf -l $OUT/system/lib64/libjni_jpegutil.so
Change-Id: I0ef011a3325e97174e5b8d36bc104c8d482354ec
Bill Yi [Thu, 29 Nov 2018 02:34:42 +0000 (18:34 -0800)]
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: Ib543768946e7401314efbcdeba0fd0ee8df31583
Bill Yi [Fri, 2 Nov 2018 21:32:28 +0000 (14:32 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
7288a72ef6 -s ours
am:
471e2c285e -s ours
Change-Id: I89f768c54a6935b7b484c17a2321054f33e7434e
Bill Yi [Fri, 2 Nov 2018 21:25:19 +0000 (14:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7288a72ef6 -s ours
Change-Id: Ifd1ae1d2a54f95e2ad308e88c24d51db0305e7e7
Bill Yi [Fri, 2 Nov 2018 17:46:13 +0000 (10:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I63b2027004f2e332e0fa25435f6059303785b12b
Bill Yi [Thu, 25 Oct 2018 13:30:39 +0000 (06:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7de4064ad0513e14c00d6ef61f94eb6cc47bdac3
Auto-generated-cl: translation import
Bill Yi [Thu, 25 Oct 2018 02:07:42 +0000 (19:07 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am:
cb669b4458 -s ours am:
293a6a0e5d -s ours
am:
fc58a495d6 -s ours
Change-Id: I84c87c112612e14f2f20c05ef3a44ed6f266ad6c
Bill Yi [Thu, 25 Oct 2018 01:48:32 +0000 (18:48 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am:
cb669b4458 -s ours
am:
293a6a0e5d -s ours
Change-Id: I8c282cf83068b936572dc399c3dd71058bb09d5d
Bill Yi [Wed, 24 Oct 2018 22:48:24 +0000 (15:48 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am:
cb669b4458 -s ours
Change-Id: I1e030fd54a5641bd125108686131f5f9be7a7d10
Bill Yi [Wed, 24 Oct 2018 21:47:15 +0000 (14:47 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Ibf4c8b20a16ccb7ef095b66d1501d26992303157
Bill Yi [Wed, 24 Oct 2018 17:35:41 +0000 (10:35 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am:
f0ef52f2c5 -s ours
am:
ee7abf6dfc -s ours
Change-Id: Ie02b451487a2b22cbdede3ca208e9145a3821b89
Bill Yi [Wed, 24 Oct 2018 17:23:30 +0000 (10:23 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am:
f0ef52f2c5 -s ours
Change-Id: Ifbcdf349f3738d5a3ff6b40154c47b6898542b37
Bill Yi [Wed, 24 Oct 2018 16:07:05 +0000 (09:07 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: Id8f471af3c079fbe894ef29332e36abc440e75d0
Bill Yi [Fri, 19 Oct 2018 22:37:44 +0000 (15:37 -0700)]
Merge pi-dr1-dev to aosp-master am:
8891a0c1cd am:
d0a3438366
am:
78753d8475
Change-Id: I8a449650eb11716f4e44ddea6b455436c9e767c1
Bill Yi [Fri, 19 Oct 2018 22:27:48 +0000 (15:27 -0700)]
Merge pi-dr1-dev to aosp-master am:
8891a0c1cd
am:
d0a3438366
Change-Id: I2ecd477e2eabf69a438cd3e8da132707c57eaefb
Bill Yi [Fri, 19 Oct 2018 21:56:47 +0000 (14:56 -0700)]
Merge pi-dr1-dev to aosp-master
am:
8891a0c1cd
Change-Id: I5f04ae2bdcc90d08541a589fe488c471756ff7ae
Bill Yi [Fri, 19 Oct 2018 19:20:44 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I16b647b03ad3ecb724664bb8f0deccfbbd28f62c
Bill Yi [Sun, 14 Oct 2018 03:02:19 +0000 (20:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
ac3faed024 -s ours
am:
dbdd038993 -s ours
Change-Id: I9259ffb054cb66094cc61abc4bccadad31ebb3fe
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
TreeHugger Robot [Sat, 29 Sep 2018 22:34:24 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 29 Sep 2018 21:37:20 +0000 (14:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
0869a7ceb5 -s ours
am:
30bdb13ce7 -s ours
Change-Id: I0de461d7fbe6b89ade9bb01cfae78f0da42ec73c
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
Bill Yi [Sat, 29 Sep 2018 07:05:51 +0000 (00:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f49d102ae03fe47f5305528284f8028c277c7dc
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Sep 2018 00:14:00 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2972f23ebfabd6872b50871462b2b46a9be6b98
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 11 Sep 2018 11:05:45 +0000 (11:05 +0000)]
Merge "Camera: Cache camera facing to id mapping"
Emilian Peev [Thu, 6 Sep 2018 14:31:31 +0000 (15:31 +0100)]
Camera: Cache camera facing to id mapping
Camera facing queries depending on camera implementation can be
expensive and involve additional IPC with side effects. Cache front&
back camera ids as early as possible.
Bug:
112563820
Test: Manual using application
Change-Id: If56f391e2c8b750fc072aa933da2185cbbbae9de
Inseob Kim [Wed, 5 Sep 2018 03:07:37 +0000 (20:07 -0700)]
Merge "Fix improper transition from gallery to camera" am:
bd400d88d9 am:
325f17593d
am:
401c1f9340
Change-Id: I781dd1bdea71e222b5b61c2869aef1624aeb1e93
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
Bill Yi [Tue, 21 Aug 2018 23:14:26 +0000 (16:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ce758aec2c134267c748c50141b50c00ca40b91
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 14 Aug 2018 19:36:46 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 14 Aug 2018 14:19:15 +0000 (07:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie9c4f9b8268bc3206dbb4c4ba14cc2c65846036f
Auto-generated-cl: translation import
Xin Li [Tue, 14 Aug 2018 01:36:50 +0000 (18:36 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master am:
a6d0b94b37
am:
344f7de59f
Change-Id: I9de73cf0a9c4e8b672c7141c07f2a3137e5b6afb
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 10:18:48 +0000 (03:18 -0700)]
Merge "Merge Android Pie into master" am:
ea4078b9f8 am:
240d59bd88 am:
a6a3ac640f
am:
762b720575
Change-Id: I0b9fee2b35fbea709b3a60df037273b7d29df058
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:42:36 +0000 (07:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
20ac5ce5cb -s ours am:
c7e65586f7 -s ours
am:
30b7068c02 -s ours
Change-Id: I7f3bdbcd1a3990c11a1f40a933b0326e12cac692
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:21:16 +0000 (21:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
30b9cfb2a4 -s ours
am:
2c164a79fd -s ours
Change-Id: I8bc94f4eae465b497eb568c59c2eb88ef54afb23
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 [Wed, 4 Jul 2018 17:43:19 +0000 (10:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifeecd245afd419d98185de3e832b373e9d7a1a7c
Auto-generated-cl: translation import
Bill Yi [Tue, 26 Jun 2018 19:38:02 +0000 (12:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib791e48fff659924ddcdadf1e3818ef7091a8ee1
Auto-generated-cl: translation import
Bill Yi [Mon, 11 Jun 2018 19:25:16 +0000 (12:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
2494723d40 -s ours
am:
a8302ec028 -s ours
Change-Id: I166bbdd46a77f4d8393db2389145c580db7a3d99
TreeHugger Robot [Mon, 11 Jun 2018 19:13:23 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Bill Yi [Sat, 9 Jun 2018 17:45:55 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5dc07c27cf7ab63dd713294954d8ab26fb73ac68
Auto-generated-cl: translation import
Xin Li [Sat, 9 Jun 2018 13:27:31 +0000 (06:27 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am:
b11752bba7
am:
0687b77bdb
Change-Id: I972f44b21097084145c1c3f7bf3576f79b430bd5
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 [Fri, 1 Jun 2018 00:45:07 +0000 (17:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I263e4915fdad5dadd01cd91d056876eaa12a1683
Auto-generated-cl: translation import
Bill Yi [Thu, 31 May 2018 22:37:19 +0000 (15:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
b49660ac79 -s ours
am:
f097b14263 -s ours
Change-Id: I1fd5d05cc42b36c0352df6392cc7207e634f97ee
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
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
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:49:52 +0000 (12:49 -0700)]
Merge "Fix a mistake of CameraAgentFactory's recycle();" am:
c7a2095139 am:
3a06cce41f
am:
4d50f1dec8
Change-Id: I3f8839b5a4b00bf2818f07fede3a301389f17e49
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();"
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
TreeHugger Robot [Fri, 25 May 2018 14:22:21 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 25 May 2018 08:35:02 +0000 (01:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
6e9b71e1d7 -s ours
am:
e99acf7b26 -s ours
Change-Id: I05d95275c3868183569775f0ee67e09994136156
Bill Yi [Fri, 25 May 2018 06:07:22 +0000 (23:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
92f1a41bc3 -s ours
am:
e60bbb5e29 -s ours
Change-Id: I2a3eb91f7bf8fff954988f34aa51d5a2a5fea1df
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
OSDN Git Service
