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

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

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

Change-Id: I2a8e2d23c662b2d90cd1bb950a24821ecdc314b3

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 [Mon, 11 Jul 2016 20:02:43 +0000 (13:02 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Wed, 6 Jul 2016 00:57:14 +0000 (17:57 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 21:54:03 +0000 (21:54 +0000)]

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

Change-Id: I326196a4e9e79cc42957dd767d9f78972bffeec0

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

Bill Yi [Mon, 27 Jun 2016 16:07:55 +0000 (09:07 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 23:17:49 +0000 (23:17 +0000)]

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

Change-Id: I8068ab7f96c0822b44d9205ae4893a6f403971aa

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:23:52 +0000 (01:23 +0000)]

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

Change-Id: I7076caf8e4f40280d77d800531116947fb5c62cb

commit | commitdiff | tree

Jose Lima [Wed, 22 Jun 2016 01:23:50 +0000 (01:23 +0000)]

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

Change-Id: I29196e2675ba202a4912ef5f0550a3ae0424c792

commit | commitdiff | tree

Dan Willemsen [Wed, 22 Jun 2016 01:23:48 +0000 (01:23 +0000)]

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

Change-Id: I5913c30bafb188662e10088646ea845457effd15

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 [Fri, 17 Jun 2016 18:49:32 +0000 (18:49 +0000)]

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

Change-Id: Ic2a79263e1b21ab90de82b41e81d313abe0db896

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

Bill Yi [Thu, 9 Jun 2016 06:44:21 +0000 (23:44 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 8 Jun 2016 13:48:57 +0000 (13:48 +0000)]

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

Change-Id: Id8826a83dcc8744bb785183ab824812934b328b5

commit | commitdiff | tree

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

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

Change-Id: I43f697bfd964b1c15a7e12126d218d5a978fa764

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 [Mon, 6 Jun 2016 16:45:42 +0000 (09:45 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Sun, 5 Jun 2016 16:00:53 +0000 (16:00 +0000)]

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

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

Change-Id: I77fcb0f91e7bd1ef38606b4778dc8c1c120eda06

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:21:15 +0000 (03:21 +0000)]

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

* commit '6c35e3dc6b4b37d7dcf79031d8fe3ba580301f90':

Change-Id: I04caefaa5b36ffc68a580cda447f80110ba835ae

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:18:50 +0000 (03:18 +0000)]

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

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

Change-Id: Ied6e159f017acdded0dc03e038ca082e91999abb

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

Bill Yi [Fri, 3 Jun 2016 01:14:37 +0000 (01:14 +0000)]

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

* commit '197778f169319819f022ce9eceea509d38af4b86':

Change-Id: Ic768bf7a52d9b47c7fd96c2f93abfcc13ee1370e

commit | commitdiff | tree

Bill Yi [Fri, 3 Jun 2016 01:14:36 +0000 (01:14 +0000)]

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

* commit '6d5d08963c130b3bd1d4854737fbd311b6ff2c38':
Bump targetSdkVersion to 24

Change-Id: I2cfcd9d3e0898beccf4408c4f7f4c2b3aa45ccad

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

Bill Yi [Wed, 1 Jun 2016 14:51:57 +0000 (07:51 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Mon, 30 May 2016 19:39:06 +0000 (12:39 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Tue, 24 May 2016 16:12:21 +0000 (09:12 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

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

* commit '9a41c8d5b013835b85cd1d6e337f3892a2a1d3ab':

Change-Id: If3e6126031d1d66cfdf96c17931512f1dc2c8d29

commit | commitdiff | tree

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

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

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

Change-Id: I112e93e8ef698df371cdfea64fd35faf2683d8d4

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

Bill Yi [Mon, 23 May 2016 09:53:56 +0000 (02:53 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 22 May 2016 23:10:21 +0000 (23:10 +0000)]

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

* commit 'cd4f2383056383854edc6e79b447910f4f935a24':

Change-Id: Id75c4a4fd9296353800761e2287e9ddc4e9b85e1

commit | commitdiff | tree

Baligh Uddin [Sun, 22 May 2016 23:10:20 +0000 (23:10 +0000)]

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

* commit '88991ae5f461e797af8d1109c44de2f464ffe5f3':
  Import translations. DO NOT MERGE

Change-Id: I7eb5bf7387a542a4fdc8ab7aaec13848dd164fb4

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

Baligh Uddin [Mon, 16 May 2016 23:32:11 +0000 (16:32 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Ian Rogers [Wed, 4 May 2016 18:58:32 +0000 (18:58 +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

(cherry picked from commit 7d927840750086a613244e94515fe75634b3af44)
Change-Id: I18518a8aa93bec8869e86b7b321048167a925514

commit | commitdiff | tree

Baligh Uddin [Wed, 4 May 2016 01:50:17 +0000 (01:50 +0000)]

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

* commit 'f90d0338a5844a079f62cbff5fa7ee48f406afbb':

Change-Id: I6b14c761c888c3392f24974e7972e2322846992e

commit | commitdiff | tree

Baligh Uddin [Wed, 4 May 2016 01:50:17 +0000 (01:50 +0000)]

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

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

Change-Id: Ic432d8407e11a6b0544b70c5c1c51a6fcc0f902f

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:04:06 +0000 (21:04 +0000)]

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

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

Change-Id: Ie4409d35a817205a33e5cc4935eb8d7489b3b7b8

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

Baligh Uddin [Mon, 2 May 2016 18:23:57 +0000 (11:23 -0700)]

Import translations. DO NOT MERGE

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

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

Baligh Uddin [Wed, 27 Apr 2016 21:18:20 +0000 (21:18 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Bill Yi [Wed, 27 Apr 2016 01:59:07 +0000 (18:59 -0700)]

Import translations. DO NOT MERGE

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