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

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: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: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)]

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: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: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: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

commit | commitdiff | tree

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

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

Change-Id: Ie67abf46c065d40b15d8783d3d7cf24168b4eec3

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 18:07:02 +0000 (18:07 +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: I2ba35cb24606cf0e65cd9596ff889c4c18aa60c1

commit | commitdiff | tree

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

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

Change-Id: I5d66dc9cf67c898b116aaf78a5678c44be5d147a

commit | commitdiff | tree

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

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

Change-Id: Id0e1b0467460904a82c2888af565d0ce7066ac36

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 8532583a62 -s ours am: e4bc8d35ec -s ours am: 13a68811cc -s ours am: 6cd915b038 -s ours am: 1c2280dea0 -s ours
am: 51d0513436 -s ours

Change-Id: I831ee178c13c8a7fe065aca8890b123270d919dc

commit | commitdiff | tree

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

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

Change-Id: I95835680a033e62e6c18a27299cee689c6b0983e

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 8532583a62 -s ours am: e4bc8d35ec -s ours am: 13a68811cc -s ours am: 6cd915b038 -s ours
am: 1c2280dea0 -s ours

Change-Id: I4afc8b4aeffe44aa985caef7b24e1e191824cca7

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 8532583a62 -s ours am: e4bc8d35ec -s ours am: 13a68811cc -s ours am: 6cd915b038 -s ours
am: 14c64f966a -s ours

Change-Id: Iae983b5d814366aa5da51212199bf3a1fc36b74c

commit | commitdiff | tree

TreeHugger Robot [Fri, 5 Aug 2016 17:58:48 +0000 (17:58 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 8532583a62 -s ours am: e4bc8d35ec -s ours am: 13a68811cc -s ours
am: 6cd915b038 -s ours

Change-Id: I061f606eb3e49e24afc8f3df1a520829781abc3a

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 8532583a62 -s ours am: e4bc8d35ec -s ours am: 13a68811cc -s ours
am: 6cd915b038 -s ours

Change-Id: Id804baa8f19ab2bb7828e513234a3101d03e0c38

commit | commitdiff | tree

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

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

Change-Id: I44ffec51b94c5935d1c887cdb22bb8394c64861f

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 8532583a62 -s ours am: e4bc8d35ec -s ours
am: 13a68811cc -s ours

Change-Id: I5476c7f99080828eb66446a2393b4fc1d9e930ab

commit | commitdiff | tree

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

Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours
am: 8fdb88e42b -s ours

Change-Id: I61c5ff5bf4bb3728a0e32c6a90d22c2f33cdd535

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:53:00 +0000 (17:53 +0000)]

Import translations. DO NOT MERGE am: 8532583a62 -s ours
am: e4bc8d35ec -s ours

Change-Id: Idf501c0343f55175147814f3824a24fd76733027

commit | commitdiff | tree

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

Import translations. DO NOT MERGE
am: 8bc8d4d4f7 -s ours

Change-Id: I03df5e56333043d9e66011ef8beae0836a8416a1

commit | commitdiff | tree

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

Import translations. DO NOT MERGE
am: 8532583a62 -s ours

Change-Id: Ibbe8d0ce668aaa2148b9dd0a78b42bf68c3ab817

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:02:07 +0000 (10:02 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Fri, 5 Aug 2016 17:01:04 +0000 (10:01 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Dan Albert [Wed, 27 Jul 2016 23:11:55 +0000 (23:11 +0000)]

Merge \\\"Add missing includes.\\\" am: 2ca742cddf am: ede3bd22c4
am: 65c808e715

Change-Id: I43e9681c153ddc5dc4fb23ce2f7cf1131bcf1e14

commit | commitdiff | tree

Dan Albert [Wed, 27 Jul 2016 23:09:02 +0000 (23:09 +0000)]

Merge \\"Add missing includes.\\" am: 2ca742cddf
am: ede3bd22c4

Change-Id: I4b22e836c4cc29e547b291f91011fd351626911b

commit | commitdiff | tree

Dan Albert [Wed, 27 Jul 2016 23:06:26 +0000 (23:06 +0000)]

Merge \"Add missing includes.\"
am: 2ca742cddf

Change-Id: I06e973f2278ca50a1158df1636508c4d91368582

commit | commitdiff | tree

Treehugger Robot [Wed, 27 Jul 2016 22:56:32 +0000 (22:56 +0000)]

Merge "Add missing includes."

commit | commitdiff | tree

Dan Albert [Wed, 27 Jul 2016 18:47:53 +0000 (18:47 +0000)]

Merge \\\"Cleanup warnings in jni.\\\" am: 685d1d8acc am: 2388de31e9
am: 414412af41

Change-Id: Ia633d501cdfd53e6e57602e5d6f837f709008eb0

commit | commitdiff | tree

Dan Albert [Wed, 27 Jul 2016 18:44:54 +0000 (18:44 +0000)]

Merge \\"Cleanup warnings in jni.\\" am: 685d1d8acc
am: 2388de31e9

Change-Id: I6b4c223ed165382ffee1b9dc7ee0180f0c7ed743

commit | commitdiff | tree

Dan Albert [Wed, 27 Jul 2016 18:42:26 +0000 (18:42 +0000)]

Merge \"Cleanup warnings in jni.\"
am: 685d1d8acc

Change-Id: I616f745e67bd1355b9c4933e32fa3b0e97f42c38

commit | commitdiff | tree

Treehugger Robot [Wed, 27 Jul 2016 18:35:09 +0000 (18:35 +0000)]

Merge "Cleanup warnings in jni."

commit | commitdiff | tree

Dan Albert [Tue, 26 Jul 2016 22:06:10 +0000 (15:06 -0700)]

Add missing includes.

These files all use malloc/free but never include it. It looks like
the NDK headers leak stdlib.h through something that was being
included, but the updated headers don't have that mess.

Test: mma
Change-Id: Ia34a2d74f382f88476708e31da819ea18ab0aa4f

commit | commitdiff | tree

Dan Albert [Tue, 26 Jul 2016 22:05:35 +0000 (15:05 -0700)]

Cleanup warnings in jni.

Test: mma
Change-Id: I1a3997525427258d628a7c59528c758070ab5f82

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chih-hung Hsieh [Thu, 7 Jul 2016 22:58:39 +0000 (22:58 +0000)]

Merge "Fix misc-macro-parentheses warnings in Gallery2."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge \"Use a NDK-compatible libjpeg\"
am: 0f763c5d10

Change-Id: Ie43896a8e9ff28542a363caf0d5c74092b5f9145

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 [Fri, 17 Jun 2016 22:51:01 +0000 (15:51 -0700)]

Use a NDK-compatible libjpeg

Change-Id: I5c6e3efca5574a97ff130e43609f860137c67572

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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