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

Bill Yi [Mon, 16 Oct 2017 07:06:29 +0000 (00:06 -0700)]

Import translations. DO NOT MERGE

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

Bug: 64712476
Change-Id: I5280cc386023aa6e501dfb2b822341a5491726c6

commit | commitdiff | tree

Bill Yi [Fri, 4 Aug 2017 22:56:51 +0000 (15:56 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0c0ee330a3f53baaa04d0ea6c826cd1752ef1f03
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Alan Viverette [Tue, 6 Jun 2017 14:34:34 +0000 (14:34 +0000)]

Move <permission> tags to correct parent element am: ba82dd3908
am: d29f35eb4c

Change-Id: Icef85c6c1bb2493420301aa33f30f27d8b99bb3a

commit | commitdiff | tree

Alan Viverette [Tue, 6 Jun 2017 14:25:46 +0000 (14:25 +0000)]

Move <permission> tags to correct parent element
am: ba82dd3908

Change-Id: I235e92d4a0dca03d86e2e18f4caeed6ce95e211c

commit | commitdiff | tree

Alan Viverette [Fri, 2 Jun 2017 14:37:32 +0000 (10:37 -0400)]

Move <permission> tags to correct parent element

AAPT2 is stricter about enforcing correctness, and the permission tags
were in the wrong place.

Fixes: 62262214
Test: builds with AAPT2
Change-Id: I20fb827f81d9b57404c6c02bdfa27acf3e572c90

commit | commitdiff | tree

Alan Viverette [Thu, 11 May 2017 11:35:55 +0000 (11:35 +0000)]

Merge "Fix makefile include for support-v4" into oc-dev am: 49496305fa
am: eee8680939

Change-Id: I173a593c8cd71e6cfdb47c6d9aadf8d99dc6c323

commit | commitdiff | tree

Bill Yi [Thu, 11 May 2017 11:35:36 +0000 (11:35 +0000)]

Import translations. DO NOT MERGE am: 907cd0546f -s ours
am: bd69754242 -s ours

Change-Id: If20c21868d46d6db2385501531b2a1cb29c0a950

commit | commitdiff | tree

Alan Viverette [Thu, 11 May 2017 05:39:02 +0000 (05:39 +0000)]

Merge "Fix makefile include for support-v4" into oc-dev
am: 49496305fa

Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3

commit | commitdiff | tree

TreeHugger Robot [Thu, 11 May 2017 02:55:03 +0000 (02:55 +0000)]

Merge "Fix makefile include for support-v4" into oc-dev

commit | commitdiff | tree

Bill Yi [Thu, 11 May 2017 01:20:35 +0000 (01:20 +0000)]

Import translations. DO NOT MERGE
am: 907cd0546f -s ours

Change-Id: I6fd4d51f07fb762db5650f690aaa5985b1aa0f9d

commit | commitdiff | tree

Bill Yi [Wed, 10 May 2017 19:42:36 +0000 (12:42 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Alan Viverette [Tue, 9 May 2017 19:46:16 +0000 (15:46 -0400)]

Fix makefile include for support-v4

Test: make Gallery2
Change-Id: I361d0844f8c71ca4a258ede082d18edf06224c9a

commit | commitdiff | tree

Bill Yi [Thu, 4 May 2017 16:49:05 +0000 (09:49 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

The Android Open Source Project [Tue, 2 May 2017 10:14:59 +0000 (03:14 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Alan Viverette [Thu, 27 Apr 2017 19:35:54 +0000 (19:35 +0000)]

Fix proguard failure when using javac am: 084ef10d7d
am: f62a9d75db

Change-Id: I9cc4269d87a884d0e66adc8ec78d71f06eefa03d

commit | commitdiff | tree

Alan Viverette [Thu, 27 Apr 2017 19:25:23 +0000 (19:25 +0000)]

Fix proguard failure when using javac
am: 084ef10d7d

Change-Id: I9da2eb3cf5f0b890992eab29f83a2368cae71190

commit | commitdiff | tree

Alan Viverette [Thu, 27 Apr 2017 19:16:37 +0000 (15:16 -0400)]

Fix proguard failure when using javac

Test: make Gallery2 ANDROID_COMPILE_WITH_JACK=false
Change-Id: Ic2576ffb72fde8677bdbf1d9f46baacc88a5b999

commit | commitdiff | tree

Alan Viverette [Fri, 21 Apr 2017 17:05:34 +0000 (17:05 +0000)]

Use explicit support library prebuilts am: 0673572ff9
am: c66df7ddf9

Change-Id: I79e0d55d015d029f331e79e442f60ccfa6a04143

commit | commitdiff | tree

Alan Viverette [Fri, 21 Apr 2017 17:02:15 +0000 (17:02 +0000)]

Use explicit support library prebuilts
am: 0673572ff9

Change-Id: I151e95a4943294d0c1a8f2f8565f4ef79b16f610

commit | commitdiff | tree

Alan Viverette [Fri, 21 Apr 2017 14:47:41 +0000 (10:47 -0400)]

Use explicit support library prebuilts

Test: make Gallery2
Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I59208256a3abd71ef8b352b132a4de0d61d88c03

commit | commitdiff | tree

Seigo Nonaka [Fri, 21 Apr 2017 10:28:45 +0000 (10:28 +0000)]

Fix build Gallery2 am: a611ca04d2
am: a86c0f3f29

Change-Id: Ib297115644b34179601c24c2976f0f7ca3a51e19

commit | commitdiff | tree

Seigo Nonaka [Fri, 21 Apr 2017 10:22:56 +0000 (10:22 +0000)]

Fix build Gallery2
am: a611ca04d2

Change-Id: I569529ea748c770b12932ab2ec61a28c03dcbf4c

commit | commitdiff | tree

Tomasz Wasilczyk [Thu, 20 Apr 2017 16:19:01 +0000 (16:19 +0000)]

Revert setting Werror flag - there are still warnings on some builds.

Change-Id: I94a2c0f5885e19d186506062e67d538ae3c7bf09
Test: it builds.
Bug: b/37159108

commit | commitdiff | tree

Seigo Nonaka [Wed, 19 Apr 2017 23:34:28 +0000 (16:34 -0700)]

Fix build Gallery2

Test: N/A
Bug: N/A
Change-Id: I1822b79d421c025d3be63af040849bde7397ac25

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 7 Apr 2017 22:53:44 +0000 (15:53 -0700)]

Fix warnings and set Werror flag to not let them happen again.

Test: it builds.
Bug: b/37159108
Change-Id: I898f5de0f8e992404977d4958b8dd44af4aea9fe

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:08:02 +0000 (09:08 +0000)]

Import translations. DO NOT MERGE am: 5ffe930607 -s ours am: 14eaf78900 -s ours
am: 42d6db3c59 -s ours

Change-Id: I0c1d7a0e41a7f8ad09d73a32dbfa29aee3abc6e0

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:01:40 +0000 (09:01 +0000)]

Import translations. DO NOT MERGE am: 5ffe930607 -s ours
am: 14eaf78900 -s ours

Change-Id: Ic8fe7f9446e65a9e26c46e5989655985018c0bef

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:50:17 +0000 (08:50 +0000)]

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

Change-Id: Iaf6552a6a14beb2dc5504a7229549a8ff36a6c0a

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 06:49:14 +0000 (23:49 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ie89627c154c5615de8cea71fb1044237a22754ef

commit | commitdiff | tree

Bill Yi [Wed, 22 Feb 2017 07:16:46 +0000 (23:16 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Paul Duffin [Tue, 21 Feb 2017 18:20:09 +0000 (18:20 +0000)]

Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9
am: 508d9e47f4

Change-Id: I1fa8a30c27e462604b1625d6f78031a12117f640

commit | commitdiff | tree

Paul Duffin [Tue, 21 Feb 2017 18:10:01 +0000 (18:10 +0000)]

Merge "Stop using junit classes in production" am: f1ec8df547
am: d382e794e9

Change-Id: I43e1638614a6076b0a664352367adce76cf80787

commit | commitdiff | tree

Paul Duffin [Tue, 21 Feb 2017 18:01:03 +0000 (18:01 +0000)]

Merge "Stop using junit classes in production"
am: f1ec8df547

Change-Id: If020e58b695e143378fde0bbe804678e74b2c905

commit | commitdiff | tree

Paul Duffin [Tue, 21 Feb 2017 11:19:20 +0000 (11:19 +0000)]

Merge "Stop using junit classes in production"

commit | commitdiff | tree

Paul Duffin [Mon, 20 Feb 2017 13:42:18 +0000 (13:42 +0000)]

Stop using junit classes in production

Bug: 35234437
Bug: 30188076
Test: make checkbuild
Change-Id: Ib24448a030f05bb43a62eecec91ba08249672426

commit | commitdiff | tree

Bill Yi [Thu, 16 Feb 2017 22:19:18 +0000 (14:19 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Mon, 6 Feb 2017 15:30:40 +0000 (07:30 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Fri, 3 Feb 2017 08:49:24 +0000 (08:49 +0000)]

Import translations. DO NOT MERGE am: bdba1ead72 -s ours
am: bd7fc276ef -s ours

Change-Id: I50af680107264190f6ee3a183879fae0ac09ed2a

commit | commitdiff | tree

Bill Yi [Fri, 3 Feb 2017 08:36:24 +0000 (08:36 +0000)]

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

Change-Id: Ia88697d0b148afd53ddc5ed30d37e4443f92ac1c

commit | commitdiff | tree

Bill Yi [Thu, 2 Feb 2017 22:15:56 +0000 (14:15 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Roozbeh Pournader [Wed, 11 Jan 2017 05:27:38 +0000 (21:27 -0800)]

Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I258030ee680426b667e52cbb1e8b7026cbe4566b

commit | commitdiff | tree

Bill Yi [Thu, 22 Dec 2016 07:35:31 +0000 (23:35 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Tue, 6 Dec 2016 03:22:29 +0000 (19:22 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Mon, 5 Dec 2016 18:22:25 +0000 (18:22 +0000)]

Revert "Import translations. DO NOT MERGE"

This reverts commit cbbcc48b4fb8e5fc0d33453bc6e76b83e4d0b396.

Change-Id: I6fa8d915a688cde649727b3a8bf0838158ae0c0c

commit | commitdiff | tree

Bill Yi [Sat, 3 Dec 2016 08:50:17 +0000 (00:50 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Mon, 21 Nov 2016 02:45:20 +0000 (02:45 +0000)]

Import translations. DO NOT MERGE am: 538f6fe844 -s ours am: 9c376d51a4 -s ours
am: a4cc0970b3 -s ours

Change-Id: I4dd5b53ed4228fb24caa540c9d40b05c1915f7e2

commit | commitdiff | tree

Bill Yi [Mon, 21 Nov 2016 02:24:34 +0000 (02:24 +0000)]

Import translations. DO NOT MERGE am: 538f6fe844 -s ours
am: 9c376d51a4 -s ours

Change-Id: I6dfa20687c41f75ab08c204a9230800b07632582

commit | commitdiff | tree

Bill Yi [Mon, 21 Nov 2016 02:02:39 +0000 (02:02 +0000)]

Import translations. DO NOT MERGE
am: 538f6fe844 -s ours

Change-Id: I4be913110c35427fc7423c4cdad59fb97ff9d464

commit | commitdiff | tree

Bill Yi [Mon, 21 Nov 2016 01:11:32 +0000 (17:11 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I73b2c2e507b1e587d9352f5a4e144b64673cc3e4

commit | commitdiff | tree

Bill Yi [Sat, 5 Nov 2016 07:00:25 +0000 (07:00 +0000)]

Import translations. DO NOT MERGE am: 503656d5fe -s ours
am: 15406ec897 -s ours

Change-Id: Ied1a2bc511b3b9403607890a25d8c95e88162b65

commit | commitdiff | tree

Bill Yi [Sat, 5 Nov 2016 06:43:45 +0000 (06:43 +0000)]

Import translations. DO NOT MERGE
am: 503656d5fe -s ours

Change-Id: I0477fd88edd82ef297355161453965d45fa52221

commit | commitdiff | tree

Bill Yi [Fri, 4 Nov 2016 20:45:13 +0000 (13:45 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Thu, 27 Oct 2016 02:14:28 +0000 (19:14 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Dan Albert [Thu, 18 Aug 2016 19:37:20 +0000 (19:37 +0000)]

Merge "Bump API to match dependencies." am: 706ab5cdf4 am: af4651e742 am: fa974e1e46
am: 7e1201e44b

Change-Id: I2ad1b191e5e7bec04514e47676f60c236823a462

commit | commitdiff | tree

Dan Albert [Thu, 18 Aug 2016 19:31:23 +0000 (19:31 +0000)]

Merge "Bump API to match dependencies." am: 706ab5cdf4 am: af4651e742
am: fa974e1e46

Change-Id: I43909dca93d2ffefee157786b6dcf63ef937dc46

commit | commitdiff | tree

Dan Albert [Thu, 18 Aug 2016 19:28:50 +0000 (19:28 +0000)]

Merge "Bump API to match dependencies." am: 706ab5cdf4
am: af4651e742

Change-Id: I25c20ce92bc77db0e590754ccf050ceb2ebdbe4b

commit | commitdiff | tree

Dan Albert [Thu, 18 Aug 2016 19:25:27 +0000 (19:25 +0000)]

Merge "Bump API to match dependencies."
am: 706ab5cdf4

Change-Id: I664ecf42e7dc31a91e48d2562fb0d13f201ca8f0

commit | commitdiff | tree

Treehugger Robot [Thu, 18 Aug 2016 19:19:41 +0000 (19:19 +0000)]

Merge "Bump API to match dependencies."

commit | commitdiff | tree

Dan Albert [Thu, 11 Aug 2016 22:33:02 +0000 (15:33 -0700)]

Bump API to match dependencies.

libjpeg_static_ndk is built against 17, so we need to be built
against at least that.

Test: mma
Bug: None
Change-Id: I6c3697010e308f04c629118c6a63f614d87b3409

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:37:50 +0000 (18:37 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours am: 86ce04b6e0 -s ours am: 10d2fa1ab5 -s ours
am: c32f5a7828 -s ours

Change-Id: Icba6165b4f29f4945b17b9dc694ddff877054555

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:37:50 +0000 (18:37 +0000)]

Import translations. DO NOT MERGE am: a9d39db63b -s ours am: da3f395420 -s ours am: a68b3e37d7 -s ours
am: 99f7849f3d -s ours

Change-Id: I36777dba90d7952a82da7079d92f3377a2e60694

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:35:28 +0000 (18:35 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours am: 86ce04b6e0 -s ours
am: 10d2fa1ab5 -s ours

Change-Id: I8a7a1997f180dbb00f1d73bac7697419d5de3f4d

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:35:28 +0000 (18:35 +0000)]

Import translations. DO NOT MERGE am: a9d39db63b -s ours am: da3f395420 -s ours
am: a68b3e37d7 -s ours

Change-Id: I6314a8fc73de504117fa4576c671dc99e1b80bca

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:35:01 +0000 (18:35 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7 -s ours am: acb237644c -s ours
am: eb4bd930d8 -s ours

Change-Id: I08944b2433ac71b1c950baaf43c91865dece6df8

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:35:01 +0000 (18:35 +0000)]

Import translations. DO NOT MERGE am: c92d371104 -s ours am: c2b38be10f -s ours
am: e10f85d7ac -s ours

Change-Id: Ibc7746918f9b528c69179ff97e6647c33a542af1

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours
am: 86ce04b6e0 -s ours

Change-Id: I5fc1263b33bd46044de5d9c3576d190983b5e20a

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:32:31 +0000 (18:32 +0000)]

Import translations. DO NOT MERGE am: a9d39db63b -s ours
am: da3f395420 -s ours

Change-Id: Ida0a4fc466a3d363f3d054b23f834fc9a5e6f38c

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:32:05 +0000 (18:32 +0000)]

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

Change-Id: I5ab7471088651c3dd11c48abc495c73e826a1f5b

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:32:04 +0000 (18:32 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours am: 83a6b9dc61 -s ours
am: de705ff417 -s ours

Change-Id: Ibb12229ced65c4e5cdb11a795cf097293d589e31

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:32:04 +0000 (18:32 +0000)]

Import translations. DO NOT MERGE am: c92d371104 -s ours
am: c2b38be10f -s ours

Change-Id: I259a242b5481025eb5eaaaffc56a9c22f5cdc424

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:32:04 +0000 (18:32 +0000)]

Import translations. DO NOT MERGE am: a9d39db63b -s ours am: 11d5993fd4 -s ours
am: cc739b6160 -s ours

Change-Id: I39a9f9f64d2c07a46943fde15bbec0d15238b4c1

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:29:01 +0000 (18:29 +0000)]

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

Change-Id: I6ca238a1467cf11050f28a8254beba786148b830

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:29:01 +0000 (18:29 +0000)]

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

Change-Id: Ic152eac3a92179537cb18ce715c500a96d376923

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:29:01 +0000 (18:29 +0000)]

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

Change-Id: I2dc389e14299d844bd9d53e12bada021988ec220

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:29:00 +0000 (18:29 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours
am: 83a6b9dc61 -s ours

Change-Id: I8110c325b71990a956c485d1074c073137c3611e

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:29:00 +0000 (18:29 +0000)]

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

Change-Id: Icfefcf9f302f18954ae85bf7103a330de8f0fcfb

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:29:00 +0000 (18:29 +0000)]

Import translations. DO NOT MERGE am: a9d39db63b -s ours
am: 11d5993fd4 -s ours

Change-Id: If8ee9e844bf0bc986ae01c275431fe0b597a0504

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours am: d82970fa79 -s ours am: 6b1d586689 -s ours am: 179fab5e9c -s ours
am: 9312ee110b -s ours

Change-Id: Icf54e471c12a6d331e133567160c6c6b6b5a1cda

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 782f3d7c49 -s ours am: 170105d749 -s ours am: 69f9855f4e -s ours am: df14faf026 -s ours
am: 1cf8eefca7 -s ours

Change-Id: I887de4943aa5cea1746c3e0328e9c403084bfd27

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:28:15 +0000 (18:28 +0000)]

Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours am: 3d376a2be0 -s ours am: 831cbc7d53 -s ours am: e430622a4f -s ours am: 46552b52fb -s ours am: 859e7dbd74 -s ours
am: 60ee8f6b33 -s ours

Change-Id: Iecc5ddf1fcd83166d39af8295735ff71ee59a564

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:26:34 +0000 (18:26 +0000)]

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

Change-Id: I41ff5e62cefb7fa5d63f36d463e974af90b434ef

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:26:33 +0000 (18:26 +0000)]

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

Change-Id: I9d29c7cae0c8e47f752173015cd7c555a2dc2c40

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:22:48 +0000 (18:22 +0000)]

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

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:22:38 +0000 (18:22 +0000)]

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

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:22:19 +0000 (18:22 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours am: d82970fa79 -s ours am: 6b1d586689 -s ours
am: 179fab5e9c -s ours

Change-Id: I6f2d5ddc35f0671fa6008642ad0647b04aa6e4a5

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:22:18 +0000 (18:22 +0000)]

Import translations. DO NOT MERGE am: 782f3d7c49 -s ours am: 170105d749 -s ours am: 69f9855f4e -s ours
am: df14faf026 -s ours

Change-Id: Iefabcdf65c8fa5abcba17b3385dc2a0908d3d4bf

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:22:17 +0000 (18:22 +0000)]

Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours am: 3d376a2be0 -s ours am: 831cbc7d53 -s ours am: e430622a4f -s ours am: 46552b52fb -s ours
am: 859e7dbd74 -s ours

Change-Id: I90cc566059b89426cd4773a902a272a0d19a0172

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:16:16 +0000 (18:16 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours am: d82970fa79 -s ours
am: 6b1d586689 -s ours

Change-Id: Ie93d551e1b156166479be7dce2cf8e20c928b3a0

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:16:15 +0000 (18:16 +0000)]

Import translations. DO NOT MERGE am: 782f3d7c49 -s ours am: 170105d749 -s ours
am: 69f9855f4e -s ours

Change-Id: Ibf358394ceda3834e0c518e938a1ce853aac1c20

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:16:15 +0000 (18:16 +0000)]

Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours am: 3d376a2be0 -s ours am: 831cbc7d53 -s ours am: e430622a4f -s ours
am: 46552b52fb -s ours

Change-Id: I9746a0a24366b399a83194f2332b948ca1e23857

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:12:31 +0000 (18:12 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours am: d82970fa79 -s ours am: 19f15893af -s ours
am: 08ae967b48 -s ours

Change-Id: I4a07ec4681f1b00b9a0bf3660d091265b8d4fe5f

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:12:30 +0000 (18:12 +0000)]

Import translations. DO NOT MERGE am: 782f3d7c49 -s ours am: 170105d749 -s ours am: 6117b0e037 -s ours
am: 76861e549e -s ours

Change-Id: I1282a436bb801dec4970dd91464263af3931a844

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:12:30 +0000 (18:12 +0000)]

Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours am: 3d376a2be0 -s ours am: 831cbc7d53 -s ours am: e430622a4f -s ours am: c065e941bc -s ours
am: 6d993ab3e9 -s ours

Change-Id: I3869a1b0df9833cc316ae3228e3a207056ea111a

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:09:33 +0000 (18:09 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours am: d82970fa79 -s ours
am: 19f15893af -s ours

Change-Id: Ie6e16c83b85c9452255093992c3a3f7f94f6d850

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:09:32 +0000 (18:09 +0000)]

Import translations. DO NOT MERGE am: 782f3d7c49 -s ours am: 170105d749 -s ours
am: 6117b0e037 -s ours

Change-Id: Id8435e75429617fc0d8abfc3907dbcb716711855

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:09:32 +0000 (18:09 +0000)]

Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours am: 3d376a2be0 -s ours am: 831cbc7d53 -s ours am: e430622a4f -s ours
am: c065e941bc -s ours

Change-Id: Idca54680b887bd39d9ca1b4fef80ad54751d97e3

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:09:31 +0000 (18:09 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours
am: d82970fa79 -s ours

Change-Id: I8c72e5a743d2d06c4839c02c5993e9cf6a5ef5eb

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:09:30 +0000 (18:09 +0000)]

Import translations. DO NOT MERGE am: 782f3d7c49 -s ours
am: 170105d749 -s ours

Change-Id: I6e006b2e086797acdc144708c648a45aa68d6e95

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:09:30 +0000 (18:09 +0000)]

Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours am: 3d376a2be0 -s ours am: 831cbc7d53 -s ours
am: e430622a4f -s ours

Change-Id: I90460ed85f31c3fa3815e1c0d29406239ecfe75e

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:07:03 +0000 (18:07 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours
am: d82970fa79 -s ours

Change-Id: Ibb27fcf6ada089b39e24ac0e4224b27df2deafec