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

Bill Yi [Fri, 5 Aug 2016 17:45:08 +0000 (17:45 +0000)]

Import translations. DO NOT MERGE am: 5f23bb8094 -s ours am: e7035ebabd -s ours
am: 002973d5cf -s ours

Change-Id: I6aee27ee969145cab91e2124c17dbf90dc0483f3

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:42:30 +0000 (17:42 +0000)]

Import translations. DO NOT MERGE am: 5f23bb8094 -s ours
am: e7035ebabd -s ours

Change-Id: I00edbcea6e6fea550e9d9aa8568d7c9d3132f8ce

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:39:59 +0000 (17:39 +0000)]

Import translations. DO NOT MERGE
am: 5f23bb8094 -s ours

Change-Id: Icdf141e3f96644d3cb9488c5fb5dd82f295774a1

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:35:24 +0000 (17:35 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ours am: 4f7455698e -s ours am: 93bb48d6b4 -s ours am: c1afd8b2b6 -s ours am: be37a3ad2b -s ours
am: b37cdb32d2 -s ours

Change-Id: I36a5cdd0b506a5d801eb2374a78f0871ed3a459f

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:35:24 +0000 (17:35 +0000)]

Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ours am: 064784017c -s ours am: 3996bc7af8 -s ours am: 5de028674b -s ours
am: 30bcb091e9 -s ours

Change-Id: I53eb51067ef2dd247c45ebc90f8d88b610038e06

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:34:27 +0000 (17:34 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ours am: 4f7455698e -s ours am: 93bb48d6b4 -s ours am: c1afd8b2b6 -s ours
am: 205162a6ca -s ours

Change-Id: Ia2faa54252387492d364b732b8661b2c419839b7

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:32:30 +0000 (17:32 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ours am: 4f7455698e -s ours am: 93bb48d6b4 -s ours am: c1afd8b2b6 -s ours
am: be37a3ad2b -s ours

Change-Id: Ie1792943fcf166dc2b1743c31b6ca6e50174140a

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:32:30 +0000 (17:32 +0000)]

Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ours am: 064784017c -s ours am: 3996bc7af8 -s ours
am: 5de028674b -s ours

Change-Id: I59e29571e854aed92d111e25429d779b015c3b6d

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:31:29 +0000 (17:31 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ours am: 4f7455698e -s ours am: 93bb48d6b4 -s ours
am: c1afd8b2b6 -s ours

Change-Id: Id241a4587c5c9810fd2a6223dc49718f49f72e1c

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:31:29 +0000 (17:31 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ours am: 4f7455698e -s ours am: 93bb48d6b4 -s ours
am: c1afd8b2b6 -s ours

Change-Id: Ib8d8cab4373332cd0ac9ae8024f476ba9d29b8b9

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:31:28 +0000 (17:31 +0000)]

Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ours am: 064784017c -s ours am: 3996bc7af8 -s ours
am: 6416b361bc -s ours

Change-Id: I102916f6f85f856a54acffce56e322c597aa55c4

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:28:56 +0000 (17:28 +0000)]

Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ours am: 064784017c -s ours
am: 3996bc7af8 -s ours

Change-Id: I74a3d2795c35210f9a52d2e4e3ab6b011a2f4aa9

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:28:55 +0000 (17:28 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ours am: 4f7455698e -s ours
am: 93bb48d6b4 -s ours

Change-Id: I4bbc19218fd23419bb9e31d386ee07cb866c3126

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:28:55 +0000 (17:28 +0000)]

Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ours am: 064784017c -s ours
am: 3996bc7af8 -s ours

Change-Id: I1c2a95bb273855a13d8253b624537349361c5045

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:26:29 +0000 (17:26 +0000)]

Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ours
am: 064784017c -s ours

Change-Id: Id836c22b58acb06d453fc3710e3448ce7e0dfde2

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:26:29 +0000 (17:26 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ours
am: 4f7455698e -s ours

Change-Id: I1bc0fdb4293a228a23bda0bf277d094aec737202

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:23:28 +0000 (17:23 +0000)]

Import translations. DO NOT MERGE am: 89c6d79299 -s ours
am: 0dcfe0f64b -s ours

Change-Id: I2f462588d3cedf61c1228d39ad48fc75916af364

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:23:28 +0000 (17:23 +0000)]

Import translations. DO NOT MERGE am: f424872b56 -s ours
am: a0a1033987 -s ours

Change-Id: Ie52a3e4ff930d7d02c7dcfad623f34e2a36e6832

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:20:58 +0000 (17:20 +0000)]

Import translations. DO NOT MERGE
am: 89c6d79299 -s ours

Change-Id: Icc8a41fc653836a3c79855788ddd06bfaef65fe8

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:20:57 +0000 (17:20 +0000)]

Import translations. DO NOT MERGE
am: f424872b56 -s ours

Change-Id: I43ec0f27379013b8e78834c42044217ce6ac5b77

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 16:31:29 +0000 (09:31 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 16:29:48 +0000 (09:29 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 16:28:52 +0000 (09:28 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Wed, 20 Jul 2016 19:20:47 +0000 (19:20 +0000)]

Import translations. DO NOT MERGE
am: 7c248bfe52 -s ours

Change-Id: Id8dddd3e521159fd764e65f7b04511e8676cead6

commit | commitdiff | tree

Bill Yi [Wed, 20 Jul 2016 16:24:44 +0000 (09:24 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 21:50:08 +0000 (21:50 +0000)]

Import translations. DO NOT MERGE am: 3d3ff15b2e -s ours
am: 819dfb4ba2 -s ours

Change-Id: I91aa5bb42a10f3d0fc76c79df2c38d70b93cc9de

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 21:46:19 +0000 (21:46 +0000)]

Import translations. DO NOT MERGE
am: 3d3ff15b2e -s ours

Change-Id: I3ff1e330a2ba6525bd140fe080f71293edb7615a

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 20:44:10 +0000 (13:44 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iee0f20d8650950540d0bb033c1f401861c7cb311

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 23:05:46 +0000 (23:05 +0000)]

Fix crash in AOSP Camera app when recording video am: 1bbfb0bc6e
am: b2a1ed3d75

Change-Id: Id323290a3f5c177e8bc3b70b18b41509564fb5ab

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 22:39:30 +0000 (22:39 +0000)]

Fix crash in AOSP Camera app when recording video
am: 1bbfb0bc6e

Change-Id: I2b6e4ce589bc3ec67014a58ade3083e5dd47d67d

commit | commitdiff | tree

Jose Lima [Tue, 21 Jun 2016 22:54:02 +0000 (15:54 -0700)]

Fix crash in AOSP Camera app when recording video

- Don't allow security exception to crash the app, if it has not been
granted DND access, and log the error instead.

Bug: 27928399
Change-Id: I4dc5b3f3b83cdf93d8cbe9299c987e58b46164de
(cherry picked from commit 35ad43aeb0d810f1ce104d17556f447743756673)

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 01:10:29 +0000 (01:10 +0000)]

Fix crash in AOSP Camera app when recording video am: 35ad43aeb0
am: e7eccc1af1

Change-Id: Id4eb4139dee5a0e3c036726d4dd080d38c24d260

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 01:07:13 +0000 (01:07 +0000)]

Fix crash in AOSP Camera app when recording video am: 35ad43aeb0
am: e1c8cd02f7

Change-Id: I4c95aaa4eb596de7c8e6417a0d54d23e01d5c27f

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 00:56:17 +0000 (00:56 +0000)]

Fix crash in AOSP Camera app when recording video
am: 35ad43aeb0

Change-Id: I00419eeb8bec9f02cdbb41c3e85d7272ace43a26

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 00:56:10 +0000 (00:56 +0000)]

Fix crash in AOSP Camera app when recording video
am: 35ad43aeb0

Change-Id: If07ba563bc7e1e3c0b48ad3ce5bdee89f0698913

commit | commitdiff | tree

Dan Willemsen [Tue, 21 Jun 2016 23:53:06 +0000 (23:53 +0000)]

Merge \\\"Use a NDK-compatible libjpeg\\\" am: ab5395fa88 am: 788a0ecf88
am: 4d0a66a358

Change-Id: Ie31bc002f83c497b09b95b17ecc74b9ac38685ba

commit | commitdiff | tree

Jose Lima [Tue, 21 Jun 2016 22:54:02 +0000 (15:54 -0700)]

commit | commitdiff | tree

Dan Willemsen [Tue, 21 Jun 2016 22:19:51 +0000 (22:19 +0000)]

Merge \\"Use a NDK-compatible libjpeg\\" am: ab5395fa88
am: 788a0ecf88

Change-Id: Iaef2ca8e22a0db5595ab63bc438e7b688249a908

commit | commitdiff | tree

Dan Willemsen [Tue, 21 Jun 2016 22:14:17 +0000 (22:14 +0000)]

Merge \"Use a NDK-compatible libjpeg\"
am: ab5395fa88

Change-Id: I1996f8ff718dcb424f3c03a31109bc93aa84b5b4

commit | commitdiff | tree

Dan Willemsen [Tue, 21 Jun 2016 22:04:28 +0000 (22:04 +0000)]

Merge "Use a NDK-compatible libjpeg"

commit | commitdiff | tree

Dan Willemsen [Wed, 8 Jun 2016 17:22:26 +0000 (10:22 -0700)]

Use a NDK-compatible libjpeg

Change-Id: Id009147f4a04ad0c12d167eefd99a336af5cefe1

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 22:19:31 +0000 (22:19 +0000)]

Import translations. DO NOT MERGE am: 30e3154428 -s ours
am: 7af0ded9ba -s ours

Change-Id: I5e745fa39376f5eb7599c0b8efce36acf51cfddb

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 22:14:51 +0000 (22:14 +0000)]

Import translations. DO NOT MERGE
am: 30e3154428 -s ours

Change-Id: I8a5a1bc05e10f68599e02bede2e54c4fa5cbb798

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 20:31:25 +0000 (13:31 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I2c065438381c7cdfe9428a9fa4f97c4bdd3e52c8

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jun 2016 13:45:55 +0000 (13:45 +0000)]

Import translations. DO NOT MERGE am: 2dbf1d956f -s ours
am: ecf0c3f9df -s ours

Change-Id: I367d1bafd6209fadcace0b4da6f89846ff8f684b

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jun 2016 13:39:53 +0000 (13:39 +0000)]

Import translations. DO NOT MERGE am: 2dbf1d956f -s ours
am: 8409b6e21f -s ours

Change-Id: I8ef0e25990a75cc4bb3edd80f13419a716948944

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jun 2016 13:32:29 +0000 (13:32 +0000)]

Import translations. DO NOT MERGE
am: 2dbf1d956f -s ours

Change-Id: I78d20aed120d5997486a5863525e7db669613608

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jun 2016 13:32:28 +0000 (13:32 +0000)]

Import translations. DO NOT MERGE
am: 2dbf1d956f -s ours

Change-Id: I48114fae7a228ebfd1696babebfe01e0c7d51e77

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jun 2016 02:42:07 +0000 (19:42 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I010ecf2b13ad8f0f4adb18098be825765f2df8a4

commit | commitdiff | tree

Bill Yi [Sun, 5 Jun 2016 15:57:18 +0000 (15:57 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 68de9fe223 -s ours

* commit '68de9fe223e6579dc4f96445351eb105f4f9819c':
Import translations. DO NOT MERGE

Change-Id: I19df7532a5453b5952a5f678cff8b38ccc83fb45

commit | commitdiff | tree

Bill Yi [Sun, 5 Jun 2016 15:49:43 +0000 (15:49 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

Bill Yi [Sat, 4 Jun 2016 03:18:50 +0000 (03:18 +0000)]

Import translations. DO NOT MERGE am: e9899203e1 -s ours
am: 77ab57c96b -s ours

* commit '77ab57c96b225b17877a9e9c6b4fef29a5e424c6':

Change-Id: I5eaacfa186e44bb67426f0df2aa8983739373bd6

commit | commitdiff | tree

Bill Yi [Sat, 4 Jun 2016 03:15:48 +0000 (03:15 +0000)]

Import translations. DO NOT MERGE am: e9899203e1  -s ours
am: 3aafd93525  -s ours

* commit '3aafd935251b8ec53a28fa6735f88f3e7cf08e63':
  Import translations. DO NOT MERGE

Change-Id: I1f4a9cccf09f5791f6631db64ef12f6a84a12312

commit | commitdiff | tree

Bill Yi [Sat, 4 Jun 2016 03:13:19 +0000 (03:13 +0000)]

Import translations. DO NOT MERGE
am: e9899203e1 -s ours

* commit 'e9899203e1341431962489e40adda1d1b896d75d':
Import translations. DO NOT MERGE

Change-Id: I5797c5bac2cc34866e5e910a3b10c9ecb7af38db

commit | commitdiff | tree

Bill Yi [Sat, 4 Jun 2016 03:13:19 +0000 (03:13 +0000)]

Import translations. DO NOT MERGE
am: e9899203e1 -s ours

* commit 'e9899203e1341431962489e40adda1d1b896d75d':
Import translations. DO NOT MERGE

Change-Id: Ie05c9c907a7ab1aaf86b1a2731ff0cadc0836dc6

commit | commitdiff | tree

Bill Yi [Fri, 3 Jun 2016 23:21:16 +0000 (16:21 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Fri, 3 Jun 2016 23:19:25 +0000 (16:19 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Jun 2016 01:10:20 +0000 (01:10 +0000)]

Merge "Bump targetSdkVersion to 24 am: 24d446633e am: 0ab35fea7c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Fri, 3 Jun 2016 01:10:07 +0000 (01:10 +0000)]

Bump targetSdkVersion to 24 am: 24d446633e
am: 9368b417de

* commit '9368b417deccfdf8af1e0663a826f59e7687d746':
Bump targetSdkVersion to 24

Change-Id: I222ec07d8bdbd7c67ece766722fd967ac0d4012a

commit | commitdiff | tree

Bill Yi [Fri, 3 Jun 2016 01:10:07 +0000 (01:10 +0000)]

Bump targetSdkVersion to 24 am: 24d446633e
am: 0ab35fea7c

* commit '0ab35fea7cd11c767ccf3c73480ca728570b43c0':
Bump targetSdkVersion to 24

Change-Id: I047e4d4d852da876a7f151f0c84d0dd30fd56069

commit | commitdiff | tree

Bill Yi [Fri, 3 Jun 2016 01:07:38 +0000 (01:07 +0000)]

Bump targetSdkVersion to 24
am: 24d446633e

* commit '24d446633e7aa5b04411f98c56ea165ac09214cf':
Bump targetSdkVersion to 24

Change-Id: I832013c2bc979638a0d1437ab00ecc3614ce3e54

commit | commitdiff | tree

Bill Yi [Fri, 3 Jun 2016 01:07:38 +0000 (01:07 +0000)]

Bump targetSdkVersion to 24
am: 24d446633e

* commit '24d446633e7aa5b04411f98c56ea165ac09214cf':
Bump targetSdkVersion to 24

Change-Id: Iadf40bfdb2a295c90673bf466dbdfa6e455258b7

commit | commitdiff | tree

Bill Yi [Thu, 2 Jun 2016 23:24:00 +0000 (16:24 -0700)]

Bump targetSdkVersion to 24

This will only affect AOSP build.

BUG:28621267
Change-Id: Ibce8fa00bee0810cb9609e27f49823db2d4257b9

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 23:44:50 +0000 (23:44 +0000)]

Merge "Merge "Make Camera support unknown higher hardware support levels." into nyc-dev am: 3041a64ba7 am: 166c2ec0b6" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 23 May 2016 23:44:45 +0000 (23:44 +0000)]

Merge "Make Camera support unknown higher hardware support levels." into nyc-dev am: 3041a64ba7
am: 166c2ec0b6

* commit '166c2ec0b62dc28e6dd58fa493eb21552ad61690':
Make Camera support unknown higher hardware support levels.

Change-Id: I14aa1d2041a8c46808e83a20ed3abb82e3bc2de1

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 23 May 2016 23:44:34 +0000 (23:44 +0000)]

Merge "Make Camera support unknown higher hardware support levels." into nyc-dev am: 3041a64ba7
am: 8dd7d1fb3e

* commit '8dd7d1fb3e25657cab1457d5ce07ece0c6d9fc39':
Make Camera support unknown higher hardware support levels.

Change-Id: Iedc63e8af53f016ad74b17da4ba8ae85ba63f57f

commit | commitdiff | tree

Sascha Haeberling [Mon, 23 May 2016 23:32:23 +0000 (23:32 +0000)]

Merge "Make Camera support unknown higher hardware support levels." into nyc-dev
am: 3041a64ba7

* commit '3041a64ba76e7dc792b8939363185421ee2962bd':
Make Camera support unknown higher hardware support levels.

Change-Id: Ie387370b76a181380c965a8ceca63bfae15b3036

commit | commitdiff | tree

Sascha Haeberling [Mon, 23 May 2016 23:30:02 +0000 (23:30 +0000)]

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 23 May 2016 23:14:37 +0000 (23:14 +0000)]

Merge "Make Camera support unknown higher hardware support levels." into nyc-dev

commit | commitdiff | tree

Sascha Haeberling [Tue, 9 Feb 2016 21:38:18 +0000 (13:38 -0800)]

Make Camera support unknown higher hardware support levels.

Bug: 28419624

Change-Id: I37e6348178d9a7234456eab50b0ba57a07c33d51

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 22 May 2016 23:07:33 +0000 (23:07 +0000)]

Merge "Import translations. DO NOT MERGE am: 69e900b5dc -s ours am: 7cf69c9b91 -s ours" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Baligh Uddin [Sun, 22 May 2016 23:07:19 +0000 (23:07 +0000)]

Import translations. DO NOT MERGE am: 69e900b5dc  -s ours
am: 10d26acae3  -s ours

* commit '10d26acae3ab47aed0eecd46ddd572d69c4326f1':
  Import translations. DO NOT MERGE

Change-Id: Ic78385c7706431e475b95aedb315ff8dd06c2cf9

commit | commitdiff | tree

Baligh Uddin [Sun, 22 May 2016 23:07:19 +0000 (23:07 +0000)]

Import translations. DO NOT MERGE am: 69e900b5dc  -s ours
am: 7cf69c9b91  -s ours

* commit '7cf69c9b9135d98498597d7e6a4adaf35a6377cc':
  Import translations. DO NOT MERGE

Change-Id: I73dda386ee6301722748d661caeae57a8800a0e5

commit | commitdiff | tree

Baligh Uddin [Sun, 22 May 2016 23:04:26 +0000 (23:04 +0000)]

Import translations. DO NOT MERGE
am: 69e900b5dc -s ours

* commit '69e900b5dc4f65009c725753f32787f8c8c9ad8a':
Import translations. DO NOT MERGE

Change-Id: I8cb2120b7141f17910ce7a4047e5f93716900ed9

commit | commitdiff | tree

Baligh Uddin [Sun, 22 May 2016 23:04:26 +0000 (23:04 +0000)]

Import translations. DO NOT MERGE
am: 69e900b5dc -s ours

* commit '69e900b5dc4f65009c725753f32787f8c8c9ad8a':
Import translations. DO NOT MERGE

Change-Id: I748b7500d47ef83c17dcf7a9a0efeada26945fe8

commit | commitdiff | tree

Baligh Uddin [Sat, 21 May 2016 18:48:36 +0000 (11:48 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 28857042
Change-Id: Idb1a0659c5482e03629427017caef7181c020582

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 4 May 2016 01:47:49 +0000 (01:47 +0000)]

Merge "Import translations. DO NOT MERGE am: e1d30cc8b4 -s ours am: f127a35e6b -s ours" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Baligh Uddin [Wed, 4 May 2016 01:47:36 +0000 (01:47 +0000)]

Import translations. DO NOT MERGE am: e1d30cc8b4  -s ours
am: 18a781e294  -s ours

* commit '18a781e294a8d1a685e49ba1222f87a3b1fd7948':
  Import translations. DO NOT MERGE

Change-Id: I89561b0356abaf94a269a4516e258bb1ec20f75d

commit | commitdiff | tree

Baligh Uddin [Wed, 4 May 2016 01:47:36 +0000 (01:47 +0000)]

Import translations. DO NOT MERGE am: e1d30cc8b4  -s ours
am: f127a35e6b  -s ours

* commit 'f127a35e6bae24669989927355710a8d0f98f249':
  Import translations. DO NOT MERGE

Change-Id: If737097fd30d2f78ebd100bd71256ecccea3eaec

commit | commitdiff | tree

Baligh Uddin [Wed, 4 May 2016 01:44:56 +0000 (01:44 +0000)]

Import translations. DO NOT MERGE
am: e1d30cc8b4 -s ours

* commit 'e1d30cc8b4fb2dff49b3bbe74ffac97e0146d1ef':
Import translations. DO NOT MERGE

Change-Id: Ied1cf5c6fbdcefaa7a44c99af91a26a69673b126

commit | commitdiff | tree

Baligh Uddin [Wed, 4 May 2016 01:44:56 +0000 (01:44 +0000)]

Import translations. DO NOT MERGE
am: e1d30cc8b4 -s ours

* commit 'e1d30cc8b4fb2dff49b3bbe74ffac97e0146d1ef':
Import translations. DO NOT MERGE

Change-Id: I0ae8570268d8d4f8d6af8639e3218e2912161217

commit | commitdiff | tree

Baligh Uddin [Wed, 4 May 2016 01:20:01 +0000 (18:20 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I16cdcbf53914ce960ba07adeabd5636e085dcce1

commit | commitdiff | tree

Ian Rogers [Tue, 3 May 2016 21:00:21 +0000 (21:00 +0000)]

Merge "Work around a type inference change in javac" am: 517383fcfe am: bf1fb66391
am: ceffdb43c5

* commit 'ceffdb43c5f6ce013790fe103c4a8a4f43d6bf55':
Work around a type inference change in javac

Change-Id: I8dfd4c3511c40a05962d635d22d2c077ceb11cc4

commit | commitdiff | tree

Ian Rogers [Tue, 3 May 2016 20:57:21 +0000 (20:57 +0000)]

Merge "Work around a type inference change in javac" am: 517383fcfe
am: bf1fb66391

* commit 'bf1fb663914532d9bd7bf779d553e83f72f248d3':
Work around a type inference change in javac

Change-Id: If20b5129b9d5d198f8f2e85f02fe388146755574

commit | commitdiff | tree

Ian Rogers [Tue, 3 May 2016 20:54:27 +0000 (20:54 +0000)]

Merge "Work around a type inference change in javac"
am: 517383fcfe

* commit '517383fcfe180b77ff95f5fd67d9a5d595481ea2':
Work around a type inference change in javac

Change-Id: I036df9c4963a37eb7ee482adc7c8452b7e9a951e

commit | commitdiff | tree

Ian Rogers [Tue, 3 May 2016 20:46:45 +0000 (20:46 +0000)]

Merge "Work around a type inference change in javac"

commit | commitdiff | tree

Ian Rogers [Sat, 30 Apr 2016 04:15:50 +0000 (21:15 -0700)]

Work around a type inference change in javac

Newer versions of javac have changes to type inference, fix to enable error
prone compile this module.

Bug: 27723540
Change-Id: I18518a8aa93bec8869e86b7b321048167a925514

commit | commitdiff | tree

Geoff Mendal [Sat, 19 Mar 2016 02:36:51 +0000 (02:36 +0000)]

Import translations. DO NOT MERGE
am: edb8d5e -s ours

* commit 'edb8d5e88de263942f26cdac5a7008a609c69b34':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Sat, 19 Mar 2016 02:28:54 +0000 (03:28 +0100)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sat, 27 Feb 2016 16:21:12 +0000 (16:21 +0000)]

Import translations. DO NOT MERGE
am: fc4919f72c -s ours

* commit 'fc4919f72c3268010113218d5b90041a1762e543':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 27 Feb 2016 07:40:07 +0000 (23:40 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I294eb653321d2b53dd535ec6ec90c1d3f8660553

commit | commitdiff | tree

Baligh Uddin [Tue, 23 Feb 2016 16:46:23 +0000 (16:46 +0000)]

Import translations. DO NOT MERGE
am: 33291d352d -s ours

* commit '33291d352d27086faa0b19220a921874b9a27737':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 23 Feb 2016 16:32:32 +0000 (08:32 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I596131d7c0ab252212ddef71f1f3a2ad8f80f59f

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Feb 2016 20:05:28 +0000 (20:05 +0000)]

Import translations. DO NOT MERGE
am: 093c5159b9 -s ours

* commit '093c5159b910d556ab80ce150a8475d0a951a556':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Feb 2016 16:22:26 +0000 (08:22 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 16:16:13 +0000 (16:16 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 9f10e59f05  -s ours
am: f6aca0e8e2  -s ours

* commit 'f6aca0e8e22bb3ee8b0f45171d05b94a3d9fd460':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 16:01:54 +0000 (16:01 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 9f10e59f05 -s ours

* commit '9f10e59f055429d0bdb9e67b0ac928403ccfc75c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 15:58:16 +0000 (15:58 +0000)]

Import translations. DO NOT MERGE am: aead3d75a5  -s ours am: 3034de6ed9  -s ours
am: 7d39233d73  -s ours

* commit '7d39233d733b8a98faf12808117d0afb69a800a7':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 15:53:09 +0000 (15:53 +0000)]

Import translations. DO NOT MERGE am: aead3d75a5  -s ours
am: 3034de6ed9  -s ours

* commit '3034de6ed95b8a9732ec3b5a9ea92d2353f89a6e':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 15:53:04 +0000 (15:53 +0000)]