OSDN Git Service
Chih-Hung Hsieh [Thu, 7 Jul 2016 23:10:50 +0000 (23:10 +0000)]
Merge \\\"Fix misc-macro-parentheses warnings in Gallery2.\\\" am:
67d7daa7b3 am:
794861c20c
am:
1bbba4b21e
Change-Id: I172cda5ca051dbb3a827b649ef4189ce1b3fd0f9
Chih-hung Hsieh [Thu, 7 Jul 2016 23:07:36 +0000 (23:07 +0000)]
Merge \\"Fix misc-macro-parentheses warnings in Gallery2.\\" am:
67d7daa7b3
am:
794861c20c
Change-Id: I2e57f02e021a0b5483b948d4f4294784a5cee72d
Chih-Hung Hsieh [Thu, 7 Jul 2016 23:04:41 +0000 (23:04 +0000)]
Merge \"Fix misc-macro-parentheses warnings in Gallery2.\"
am:
67d7daa7b3
Change-Id: Id6627d6808aaaafa59d64161c685f5c89ee5d0b8
Chih-hung Hsieh [Thu, 7 Jul 2016 22:58:39 +0000 (22:58 +0000)]
Merge "Fix misc-macro-parentheses warnings in Gallery2."
Chih-Hung Hsieh [Wed, 29 Jun 2016 18:42:46 +0000 (11:42 -0700)]
Fix misc-macro-parentheses warnings in Gallery2.
Add parentheses around negative literals and parameters beside operators.
Bug:
28705665
Test: build with clang-tidy
Change-Id: Icdb2d003e77f6b0dfac7d9c30dec0ee80c13e3cd
Bill Yi [Thu, 30 Jun 2016 21:51:02 +0000 (21:51 +0000)]
Import translations. DO NOT MERGE am:
e5c1fb30a3 -s ours
am:
e6dc0e5d11 -s ours
Change-Id: Ib40fb271d1c25cf97ccdb8efcfb243310b7e3abb
Bill Yi [Thu, 30 Jun 2016 21:47:15 +0000 (21:47 +0000)]
Import translations. DO NOT MERGE
am:
e5c1fb30a3 -s ours
Change-Id: I04a82fd8f285ba470f92e65a4eb942360e4d121d
Bill Yi [Thu, 30 Jun 2016 20:46:17 +0000 (13:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I7a95e713534c31a62fb4d6362ac6f0347075847a
Dan Willemsen [Tue, 21 Jun 2016 23:33:28 +0000 (23:33 +0000)]
Merge \\\"Use a NDK-compatible libjpeg\\\" am:
0f763c5d10 am:
2da3ecb5c6
am:
73a177a26c
Change-Id: I56ecec5ecefe61c885b099f138b7326d16c84994
Dan Willemsen [Tue, 21 Jun 2016 22:19:33 +0000 (22:19 +0000)]
Merge \\"Use a NDK-compatible libjpeg\\" am:
0f763c5d10
am:
2da3ecb5c6
Change-Id: I99a5e3a21af2ad1de6e919f2bddb7cdea10560a7
Dan Willemsen [Tue, 21 Jun 2016 22:14:20 +0000 (22:14 +0000)]
Merge \"Use a NDK-compatible libjpeg\"
am:
0f763c5d10
Change-Id: Ie43896a8e9ff28542a363caf0d5c74092b5f9145
Dan Willemsen [Tue, 21 Jun 2016 22:04:28 +0000 (22:04 +0000)]
Merge "Use a NDK-compatible libjpeg"
Dan Willemsen [Fri, 17 Jun 2016 22:51:01 +0000 (15:51 -0700)]
Use a NDK-compatible libjpeg
Change-Id: I5c6e3efca5574a97ff130e43609f860137c67572
Bill Yi [Thu, 16 Jun 2016 22:06:53 +0000 (22:06 +0000)]
Import translations. DO NOT MERGE am:
f9f56ebf74 -s ours
am:
10900ad197 -s ours
Change-Id: Ib36acaace839df0f7606e1d5340cd882a2e5d36a
Bill Yi [Thu, 16 Jun 2016 22:02:05 +0000 (22:02 +0000)]
Import translations. DO NOT MERGE
am:
f9f56ebf74 -s ours
Change-Id: I4c7a07acc3c9604e71a1ffce0d99e03b1193bc0e
Bill Yi [Thu, 16 Jun 2016 20:33:31 +0000 (13:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: Id29b53253314e55ac4f40071522b294945977c31
Bill Yi [Sun, 5 Jun 2016 15:57:34 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
5ce01c13e5 -s ours
* commit '
5ce01c13e541abbc6a3e75b0bbc92699c86b7700':
Import translations. DO NOT MERGE
Change-Id: Ifb79ac6a141900634068b04f70c3b85b5bb23385
Bill Yi [Sun, 5 Jun 2016 15:50:57 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Sat, 4 Jun 2016 03:13:47 +0000 (03:13 +0000)]
Import translations. DO NOT MERGE am:
ec0da15947 -s ours
am:
cd83310928 -s ours
* commit '
cd833109286029b4178725a4cfbf2c19621cd049':
Change-Id: Ibfbd07da6668507d1ee430d8aafdd55b25290d2e
Bill Yi [Sat, 4 Jun 2016 03:13:19 +0000 (03:13 +0000)]
Import translations. DO NOT MERGE am:
ec0da15947 -s ours
am:
b2f48d94e5 -s ours
* commit '
b2f48d94e5e7829236610e3a88293682efb26059':
Import translations. DO NOT MERGE
Change-Id: I7c7969185a633cb888e9fcf6d7de221c66d906b9
Bill Yi [Sat, 4 Jun 2016 03:10:44 +0000 (03:10 +0000)]
Import translations. DO NOT MERGE
am:
ec0da15947 -s ours
* commit '
ec0da15947a0a5f20cc30dc44cfd50879035e10d':
Import translations. DO NOT MERGE
Change-Id: I18258a81618e7218e4622c6139b197b72ed6cd8f
Bill Yi [Sat, 4 Jun 2016 03:10:44 +0000 (03:10 +0000)]
Import translations. DO NOT MERGE
am:
ec0da15947 -s ours
* commit '
ec0da15947a0a5f20cc30dc44cfd50879035e10d':
Import translations. DO NOT MERGE
Change-Id: I81c335eb578617924d2475f31849939c8bbe9e63
Bill Yi [Fri, 3 Jun 2016 23:26:59 +0000 (16:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaad119579ac95361db99cf889a6fecface9f4375
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 23:24:50 +0000 (16:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6572d267f839e1270257299ff5eec1a6147c17c3
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 3 Jun 2016 01:10:42 +0000 (01:10 +0000)]
Merge "Bump targetSdkVersion to 24 am:
61d7e4b11b am:
beb1ee7b9a" into nyc-mr1-dev-plus-aosp
Bill Yi [Fri, 3 Jun 2016 01:10:31 +0000 (01:10 +0000)]
Bump targetSdkVersion to 24 am:
61d7e4b11b
am:
beb1ee7b9a
* commit '
beb1ee7b9a335b005d56f9049cbb0a07146c2018':
Bump targetSdkVersion to 24
Change-Id: I8f2fac7a8ce722e521530f070f13d88cdd0eb5af
Bill Yi [Fri, 3 Jun 2016 01:10:27 +0000 (01:10 +0000)]
Bump targetSdkVersion to 24 am:
61d7e4b11b
am:
0a02d551b0
* commit '
0a02d551b05ce95bd8497802ff9fb3d9e47c0848':
Bump targetSdkVersion to 24
Change-Id: Ic80d6f8e4bab9e7868633ee9a15ffea812f94a66
Bill Yi [Fri, 3 Jun 2016 01:07:58 +0000 (01:07 +0000)]
Bump targetSdkVersion to 24
am:
61d7e4b11b
* commit '
61d7e4b11be76bf4b01c1ffffa88e361038d4018':
Bump targetSdkVersion to 24
Change-Id: Idd22a2ce3f22ff51306fea4f2cc7df2bf9139460
Bill Yi [Fri, 3 Jun 2016 01:07:52 +0000 (01:07 +0000)]
Bump targetSdkVersion to 24
am:
61d7e4b11b
* commit '
61d7e4b11be76bf4b01c1ffffa88e361038d4018':
Bump targetSdkVersion to 24
Change-Id: Ie2a1f5df6e1cd55d3a9ffc732df373484308a47c
Bill Yi [Thu, 2 Jun 2016 22:51:25 +0000 (15:51 -0700)]
Bump targetSdkVersion to 24
This will only affect AOSP build.
BUG:
28621267
Change-Id: I814ee202d3bfe55cce93bc67e30ffa8bb450db9a
Baligh Uddin [Sun, 22 May 2016 23:19:33 +0000 (23:19 +0000)]
Import translations. DO NOT MERGE am:
d343a1e994 -s ours
am:
2dad2746a8 -s ours
* commit '
2dad2746a87ec95f9aaa22766b6a358b00448df1':
Change-Id: I7ed587fcbfc102c71e933e09106108e59d24a650
Baligh Uddin [Sun, 22 May 2016 23:16:32 +0000 (23:16 +0000)]
Import translations. DO NOT MERGE am:
d343a1e994 -s ours
am:
02570d09e0 -s ours
* commit '
02570d09e0e54590bacbd332e336b4a3e43d6eca':
Import translations. DO NOT MERGE
Change-Id: Id36db9862d69a4e85b703d5d36426e10ebc29326
Baligh Uddin [Sun, 22 May 2016 23:13:57 +0000 (23:13 +0000)]
Import translations. DO NOT MERGE
am:
d343a1e994 -s ours
* commit '
d343a1e99490f4417c952c8b313f2ec29da72fc2':
Import translations. DO NOT MERGE
Change-Id: I65ae15509bc83d1cdf303b5b0f0d9fc871c2e02f
Baligh Uddin [Sun, 22 May 2016 23:13:51 +0000 (23:13 +0000)]
Import translations. DO NOT MERGE
am:
d343a1e994 -s ours
* commit '
d343a1e99490f4417c952c8b313f2ec29da72fc2':
Import translations. DO NOT MERGE
Change-Id: I1ea5326e72b544f4d7dde6e6b5bf38fd2baedacb
Baligh Uddin [Sat, 21 May 2016 18:51:06 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I7bad47e9af9e77f0eba438457821bc6c24834c4c
Android Build Merger (Role) [Wed, 4 May 2016 01:50:27 +0000 (01:50 +0000)]
Merge "Import translations. DO NOT MERGE am:
92bd69b1e7 -s ours am:
b1c751fccf -s ours" into nyc-mr1-dev-plus-aosp
Baligh Uddin [Wed, 4 May 2016 01:50:16 +0000 (01:50 +0000)]
Import translations. DO NOT MERGE am:
92bd69b1e7 -s ours
am:
67a57d1716 -s ours
* commit '
67a57d1716d4c86d0b9758358a52569e201d3b8c':
Import translations. DO NOT MERGE
Change-Id: I38e3298f909c10ce6afe541f85bf5d6f6715aaad
Baligh Uddin [Wed, 4 May 2016 01:50:16 +0000 (01:50 +0000)]
Import translations. DO NOT MERGE am:
92bd69b1e7 -s ours
am:
b1c751fccf -s ours
* commit '
b1c751fccfad8c532aeb0f3c9d839d339bd49bba':
Import translations. DO NOT MERGE
Change-Id: Icc6372ee06fcc0919c7662445dfe228237620806
Baligh Uddin [Wed, 4 May 2016 01:47:36 +0000 (01:47 +0000)]
Import translations. DO NOT MERGE
am:
92bd69b1e7 -s ours
* commit '
92bd69b1e791250fd929cc0cac31865f18bbe6ce':
Import translations. DO NOT MERGE
Change-Id: I0af9de4d8a05a2673e9d7973d581d4c3e0df0aed
Baligh Uddin [Wed, 4 May 2016 01:47:35 +0000 (01:47 +0000)]
Import translations. DO NOT MERGE
am:
92bd69b1e7 -s ours
* commit '
92bd69b1e791250fd929cc0cac31865f18bbe6ce':
Import translations. DO NOT MERGE
Change-Id: Ie296e0593cda9f2c53f8a479d61f7b0a2300119c
Baligh Uddin [Wed, 4 May 2016 01:22:12 +0000 (18:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: Ibcc3bcfbf3f177b384cb3e8791bf4086bb168a14
Jaesung Chung [Wed, 30 Mar 2016 01:48:29 +0000 (01:48 +0000)]
Gallery2: support the newly added media file types in MTP mode
am:
6669f2c
* commit '
6669f2c4e92da4ee45c0d23ebee38a2cf0e7f539':
Gallery2: support the newly added media file types in MTP mode
Change-Id: Ib6f60b182d9b6c369bae034d2bffdafb933b6c21
Jaesung Chung [Wed, 23 Mar 2016 04:27:31 +0000 (21:27 -0700)]
Gallery2: support the newly added media file types in MTP mode
And also allows to import RAW images introduced from N.
Bug:
27125321
Change-Id: I8eda0503b7b07938a05655c9ae321bedfd2123b9
Greg Kaiser [Mon, 21 Mar 2016 13:55:25 +0000 (13:55 +0000)]
Merge "Gallery2: Fix use of uninitialized stack variables" into nyc-dev
am:
fc0d616
* commit '
fc0d6167702c3d79124179e1e2d3bf70474c61a8':
Gallery2: Fix use of uninitialized stack variables
Greg Kaiser [Mon, 21 Mar 2016 13:49:10 +0000 (13:49 +0000)]
Merge "Gallery2: Fix use of uninitialized stack variables" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 02:45:10 +0000 (02:45 +0000)]
Import translations. DO NOT MERGE
am:
74e6f87 -s ours
* commit '
74e6f87149e2223844335ea27746983fb6f087a8':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 19 Mar 2016 02:32:02 +0000 (03:32 +0100)]
Import translations. DO NOT MERGE
Change-Id: I22abc2cee7f3e0ca31e45370d4695ef176e775cc
Auto-generated-cl: translation import
Ian Rogers [Fri, 18 Mar 2016 18:52:40 +0000 (18:52 +0000)]
Merge "Float.NaN != ... always evaluates to true, use Float.isNaN."
am:
c09248b
* commit '
c09248bd12db1e84b9fbfd0e47cf2ed6a85c1f65':
Float.NaN != ... always evaluates to true, use Float.isNaN.
Ian Rogers [Fri, 18 Mar 2016 17:45:14 +0000 (17:45 +0000)]
Merge "Float.NaN != ... always evaluates to true, use Float.isNaN."
Ian Rogers [Fri, 18 Mar 2016 05:39:05 +0000 (22:39 -0700)]
Float.NaN != ... always evaluates to true, use Float.isNaN.
Caught by error prone.
http://errorprone.info/bugpattern/EqualsNaN
Bug:
27723540
Change-Id: Ia83b2937ab9e92ebd1c52b7199903a599fbe5ce5
Greg Kaiser [Mon, 14 Mar 2016 18:59:52 +0000 (11:59 -0700)]
Gallery2: Fix use of uninitialized stack variables
In estmateWhiteBox(), we were adding up several variables,
but never initialized them to zero.
Change-Id: Ia77d92faa5150da0a1d7a04839729febefa63f74
Baligh Uddin [Tue, 23 Feb 2016 16:45:07 +0000 (16:45 +0000)]
Import translations. DO NOT MERGE
am:
dd25dbe55a -s ours
* commit '
dd25dbe55a28122415a6c8d8fc556d2a31f7f248':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Feb 2016 16:34:39 +0000 (08:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Idc807a194c84fbf25bcdeae9011a4ed1180f2a5f
Geoff Mendal [Tue, 2 Feb 2016 16:17:28 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
d0bd0e96f7 -s ours
am:
6f8ca67be9 -s ours
* commit '
6f8ca67be943f6eb23183f18d3e1ecfde9869a83':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:17:21 +0000 (16:17 +0000)]
Import translations. DO NOT MERGE am:
39fa242356 -s ours am:
2415acb72f -s ours
am:
000b9050e7 -s ours
* commit '
000b9050e7112f87794bae7fa5e4c18862d8afae':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:03:00 +0000 (16:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
d0bd0e96f7 -s ours
* commit '
d0bd0e96f7f4e42afdc8b4beb69a34fcaa1317e6':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:02:51 +0000 (16:02 +0000)]
Import translations. DO NOT MERGE am:
39fa242356 -s ours
am:
2415acb72f -s ours
* commit '
2415acb72f88cf3f9214103ece1eb55eaa4c323b':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:55:53 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 15:53:15 +0000 (15:53 +0000)]
Import translations. DO NOT MERGE
am:
39fa242356 -s ours
* commit '
39fa242356a1d57551e20d721cfb2bacbf3565d6':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:50:00 +0000 (09:50 -0600)]
Import translations. DO NOT MERGE
Change-Id: I4b89e67b22e8bbf0ef230b2e5916b0f18475008d
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 15:39:27 +0000 (07:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id5277a995c04d7baa469cb10673f24ef96072117
Auto-generated-cl: translation import
Anton Daubert [Mon, 25 Jan 2016 18:29:03 +0000 (19:29 +0100)]
Simply the mimetype handling for images by using image/*. This will also accept the newly added mimtypes for RAW images.
Bug:
26630396
Change-Id: I66e6c03399d571a5333f7245b748a8c9017a9c94
Geoff Mendal [Mon, 18 Jan 2016 13:25:03 +0000 (05:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8f1c42793926f5799a4840aecb2afd409768931d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Dec 2015 13:18:48 +0000 (05:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I82bf3905a02b034bd795316bc2df772cbc2edb14
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Dec 2015 13:34:49 +0000 (05:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1096e5e81142e00726772a77d62515d492c61bdb
Auto-generated-cl: translation import
Ying Wang [Wed, 16 Dec 2015 20:01:56 +0000 (20:01 +0000)]
Merge "Fix ProGuard error." am:
42cb024cff
am:
a6d029fde3
* commit '
a6d029fde3419625f6762eb115e209f8e221b089':
Fix ProGuard error.
Ying Wang [Wed, 16 Dec 2015 19:57:20 +0000 (19:57 +0000)]
Merge "Fix ProGuard error."
am:
42cb024cff
* commit '
42cb024cff9d5fd3231ce8c7cb3c855f34693813':
Fix ProGuard error.
Ying Wang [Wed, 16 Dec 2015 19:45:23 +0000 (19:45 +0000)]
Merge "Fix ProGuard error."
Ying Wang [Wed, 16 Dec 2015 19:39:33 +0000 (11:39 -0800)]
Fix ProGuard error.
Fix ProGuard error "library class references program class".
Change-Id: I4c6d923cdf5137dc8fbb193265e604908eb63bc1
Geoff Mendal [Wed, 16 Dec 2015 13:33:13 +0000 (05:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I593989ea6903bf7655191882b8c004b55db2cd77
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Nov 2015 13:38:31 +0000 (05:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia0146d727443f96a0ddfa95db2c6e882c29ae783
Auto-generated-cl: translation import
Miao Wang [Fri, 6 Nov 2015 22:39:05 +0000 (14:39 -0800)]
Make Gallery2 use platform RenderScript
Bug:
25226912
Change-Id: I26c3d86b4ef6c0611b97731e849eab526521e5c2
Miao Wang [Tue, 10 Nov 2015 04:52:08 +0000 (04:52 +0000)]
Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""" am:
7982e8876e am:
d762ffe7b1
am:
86cfcda84a
* commit '
86cfcda84a158fdd68ba3f31b9cda1a27afc3d66':
Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""
Miao Wang [Tue, 10 Nov 2015 04:49:56 +0000 (04:49 +0000)]
Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""" am:
7982e8876e
am:
d762ffe7b1
* commit '
d762ffe7b14b4ce1a99797297d85c1443689350a':
Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""
Miao Wang [Tue, 10 Nov 2015 04:46:45 +0000 (04:46 +0000)]
Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript""""
am:
7982e8876e
* commit '
7982e8876e22435884dd94983bccefaed4fc8d76':
Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""
Miao Wang [Tue, 10 Nov 2015 04:46:15 +0000 (04:46 +0000)]
Merge "Make Gallery2 use platform RenderScript"
Miao Wang [Fri, 6 Nov 2015 22:39:05 +0000 (14:39 -0800)]
Make Gallery2 use platform RenderScript
Bug:
25226912
Change-Id: I53221359cf4143d44ec1167e3a94e0013975dfa5
Miao Wang [Tue, 10 Nov 2015 04:45:01 +0000 (04:45 +0000)]
Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript""""
Miao Wang [Tue, 10 Nov 2015 04:42:40 +0000 (04:42 +0000)]
Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""
This reverts commit
c5a49d22a4b4f94eead77fe5f2d14095c12500e8.
Change-Id: I4a95623cf0d54d6c64b033cca9f7db78f4f51d83
(cherry picked from commit
562ad517e0a19aaaf6c9794e562a097a328698f7)
Miao Wang [Tue, 10 Nov 2015 04:43:37 +0000 (04:43 +0000)]
Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript""""
Miao Wang [Tue, 10 Nov 2015 04:42:40 +0000 (04:42 +0000)]
Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""
This reverts commit
c5a49d22a4b4f94eead77fe5f2d14095c12500e8.
Change-Id: I4a95623cf0d54d6c64b033cca9f7db78f4f51d83
Miao Wang [Tue, 10 Nov 2015 02:34:30 +0000 (02:34 +0000)]
Merge "Revert "Revert "Make Gallery2 use platform RenderScript""" am:
7bc371932a am:
f750352102
am:
2d30791cd8
* commit '
2d30791cd826d5c491d49586e8117559f9a9af6c':
Revert "Revert "Make Gallery2 use platform RenderScript""
Miao Wang [Mon, 9 Nov 2015 20:16:21 +0000 (20:16 +0000)]
Revert "Revert "Make Gallery2 use platform RenderScript""
This reverts commit
f206f45f0debc6ec4e89cdf2ce620ce7b128aa29.
Change-Id: Ia95b8f83bc8d6677ef31acf95a287557435ac576
(cherry picked from commit
c5a49d22a4b4f94eead77fe5f2d14095c12500e8)
Miao Wang [Mon, 9 Nov 2015 23:06:48 +0000 (23:06 +0000)]
Merge "Revert "Revert "Make Gallery2 use platform RenderScript""" am:
7bc371932a
am:
f750352102
* commit '
f7503521022257de4d5b91e9141b0160bbd1d7e4':
Revert "Revert "Make Gallery2 use platform RenderScript""
Miao Wang [Mon, 9 Nov 2015 23:03:32 +0000 (23:03 +0000)]
Merge "Revert "Revert "Make Gallery2 use platform RenderScript"""
am:
7bc371932a
* commit '
7bc371932a1fc9eb5f5537faec5b9a02c4aaed43':
Revert "Revert "Make Gallery2 use platform RenderScript""
Miao Wang [Mon, 9 Nov 2015 22:58:13 +0000 (22:58 +0000)]
Merge "Revert "Revert "Make Gallery2 use platform RenderScript"""
Miao Wang [Mon, 9 Nov 2015 20:16:21 +0000 (20:16 +0000)]
Revert "Revert "Make Gallery2 use platform RenderScript""
This reverts commit
f206f45f0debc6ec4e89cdf2ce620ce7b128aa29.
Change-Id: Ia95b8f83bc8d6677ef31acf95a287557435ac576
Geoff Mendal [Mon, 9 Nov 2015 13:49:11 +0000 (05:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iddd48433fd950e12fbdd2ef25f024a8d3eba5b83
Auto-generated-cl: translation import
Miao Wang [Sat, 7 Nov 2015 03:10:05 +0000 (03:10 +0000)]
Merge "Revert "Make Gallery2 use platform RenderScript"" am:
643998123e am:
20864b088d
am:
fc52c27cf0
* commit '
fc52c27cf0992e11c56f30c26784d142366eb5d7':
Revert "Make Gallery2 use platform RenderScript"
Miao Wang [Sat, 7 Nov 2015 03:07:32 +0000 (03:07 +0000)]
Merge "Revert "Make Gallery2 use platform RenderScript"" am:
643998123e
am:
20864b088d
* commit '
20864b088d1fd615f892f9415cf6ff634eeff9ff':
Revert "Make Gallery2 use platform RenderScript"
Miao Wang [Sat, 7 Nov 2015 03:04:45 +0000 (03:04 +0000)]
Merge "Revert "Make Gallery2 use platform RenderScript""
am:
643998123e
* commit '
643998123e7f96a9d05c038f649a8ce662765dcd':
Revert "Make Gallery2 use platform RenderScript"
Miao Wang [Sat, 7 Nov 2015 03:01:57 +0000 (03:01 +0000)]
Merge "Revert "Make Gallery2 use platform RenderScript""
Miao Wang [Sat, 7 Nov 2015 03:01:45 +0000 (03:01 +0000)]
Revert "Make Gallery2 use platform RenderScript"
This reverts commit
5dfae02b900c3bea59843f5227a5f05af6f50f20.
Change-Id: I1275ade272d474966728f00c4f95bda3f2d045e6
Miao Wang [Fri, 6 Nov 2015 23:09:25 +0000 (23:09 +0000)]
Merge "Make Gallery2 use platform RenderScript" am:
9f16042f46 am:
6a766a2e30
am:
1c549446d1
* commit '
1c549446d185908a5c5b192c1efb81c8a32e06ae':
Make Gallery2 use platform RenderScript
Baligh Uddin [Fri, 6 Nov 2015 23:09:10 +0000 (23:09 +0000)]
Import translations. DO NOT MERGE am:
f7de051f76 -s ours
am:
eb2d4dbb02 -s ours
* commit '
eb2d4dbb024ed34a9f34acc7010de948d9380158':
Import translations. DO NOT MERGE
Miao Wang [Fri, 6 Nov 2015 23:07:14 +0000 (23:07 +0000)]
Merge "Make Gallery2 use platform RenderScript" am:
9f16042f46
am:
6a766a2e30
* commit '
6a766a2e3000cb58dafac5a1a482e00b68b9bc11':
Make Gallery2 use platform RenderScript
Miao Wang [Fri, 6 Nov 2015 23:05:05 +0000 (23:05 +0000)]
Merge "Make Gallery2 use platform RenderScript"
am:
9f16042f46
* commit '
9f16042f469fb92d684a773fc31db00d1bb04fb4':
Make Gallery2 use platform RenderScript
Miao Wang [Fri, 6 Nov 2015 23:01:45 +0000 (23:01 +0000)]
Merge "Make Gallery2 use platform RenderScript"
Miao Wang [Fri, 6 Nov 2015 22:39:05 +0000 (14:39 -0800)]
Make Gallery2 use platform RenderScript
Bug:
25226912
Change-Id: I818dceee7bb38ed9d6b7d1959e6c96cd1f302536
Baligh Uddin [Thu, 5 Nov 2015 20:00:25 +0000 (20:00 +0000)]
Import translations. DO NOT MERGE
am:
f7de051f76 -s ours
* commit '
f7de051f768838870b16eec96669d8c2e81f3961':
Import translations. DO NOT MERGE