summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge ↵lineage-15.0android-build-team Robot2017-06-070-0/+0
|\ | | | | | | "release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-4075595 snap-temp-L43000000071370789" into oc-release
| * release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-4075 ↵android-build-team Robot2017-06-071-6/+0
| |\ | | | | | | | | | | | | | | | 595 snap-temp-L43000000071370789 Change-Id: I9fedb577e2552c26c06652d51340474a2aa6ebe7
* | \ release-request-224b654d-e3ad-4f05-a95d-d10d1516b3f6-for-git_oc-release-4075 ↵android-build-team Robot2017-06-071-6/+0
|\ \ \ | |/ / |/| / | |/ | | | | 622 snap-temp-L17600000071371496 Change-Id: Ifd056cba797ac2c3c7d5ea224026cd527dd736b1
| * Move <permission> tags to correct parent elementAlan Viverette2017-06-051-6/+0
|/ | | | | | | | | AAPT2 is stricter about enforcing correctness, and the permission tags were in the wrong place. Fixes: 62262214 Test: builds with AAPT2 Change-Id: I20fb827f81d9b57404c6c02bdfa27acf3e572c90
* Merge "Fix makefile include for support-v4" into oc-devTreeHugger Robot2017-05-111-2/+3
|\
| * Fix makefile include for support-v4Alan Viverette2017-05-091-2/+3
| | | | | | | | | | Test: make Gallery2 Change-Id: I361d0844f8c71ca4a258ede082d18edf06224c9a
* | Import translations. DO NOT MERGEBill Yi2017-05-102-8/+8
|/ | | | | Change-Id: Ib4083351435abccd9a56eb63896203538fa726b4 Auto-generated-cl: translation import
* Fix proguard failure when using javacAlan Viverette2017-04-271-2/+4
| | | | | Test: make Gallery2 ANDROID_COMPILE_WITH_JACK=false Change-Id: Ic2576ffb72fde8677bdbf1d9f46baacc88a5b999
* Use explicit support library prebuiltsAlan Viverette2017-04-211-2/+2
| | | | | | Test: make Gallery2 Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I59208256a3abd71ef8b352b132a4de0d61d88c03
* Fix build Gallery2Seigo Nonaka2017-04-191-1/+2
| | | | | | Test: N/A Bug: N/A Change-Id: I1822b79d421c025d3be63af040849bde7397ac25
* Import translations. DO NOT MERGEBill Yi2017-02-211-1/+1
| | | | | Change-Id: Iea7efcca8eecc21cdf8eda27a4e664365f2a1f5f Auto-generated-cl: translation import
* Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9Paul Duffin2017-02-215-14/+12
|\ | | | | | | | | | | am: 508d9e47f4 Change-Id: I1fa8a30c27e462604b1625d6f78031a12117f640
| * Merge "Stop using junit classes in production" am: f1ec8df547Paul Duffin2017-02-215-14/+12
| |\ | | | | | | | | | | | | | | | am: d382e794e9 Change-Id: I43e1638614a6076b0a664352367adce76cf80787
| | * Merge "Stop using junit classes in production"Paul Duffin2017-02-215-14/+12
| |/| | | | | | | | | | | | | | | | am: f1ec8df547 Change-Id: If020e58b695e143378fde0bbe804678e74b2c905
| | * Merge "Stop using junit classes in production"Paul Duffin2017-02-215-14/+12
| | |\
| | | * Stop using junit classes in productionPaul Duffin2017-02-205-14/+12
| | |/ | | | | | | | | | | | | | | | | | | Bug: 35234437 Bug: 30188076 Test: make checkbuild Change-Id: Ib24448a030f05bb43a62eecec91ba08249672426
* | | Import translations. DO NOT MERGEBill Yi2017-02-162-4/+4
| | | | | | | | | | | | | | | Change-Id: I50a25080b5a81c359a88c244ca4050f4931a3a4a Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-02-061-1/+1
| | | | | | | | | | | | | | | Change-Id: If4a3fd1789ecc43a7a18abd257c319fe43f178e1 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGE am: bdba1ead72 -s oursBill Yi2017-02-030-0/+0
|\| | | | | | | | | | | | | | | | | am: bd7fc276ef -s ours Change-Id: I50af680107264190f6ee3a183879fae0ac09ed2a
| * | Import translations. DO NOT MERGEBill Yi2017-02-030-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | am: bdba1ead72 -s ours Change-Id: Ia88697d0b148afd53ddc5ed30d37e4443f92ac1c
| | * | Import translations. DO NOT MERGEBill Yi2017-02-024-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic65aef98626ccccf928779d23df022434aa60436 Auto-generated-cl: translation import
* | | | Rename language+country resources to just languageRoozbeh Pournader2017-01-1040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 26496609 Test: none Change-Id: I258030ee680426b667e52cbb1e8b7026cbe4566b
* | | | Import translations. DO NOT MERGEBill Yi2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia8241a0a163c2b0101059f3304cc232c64299412 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBill Yi2016-12-052-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I31004f5b4b447cbe2fd3b4b8183034c65fe9c4ae Auto-generated-cl: translation import
* | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0580-0/+12480
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cbbcc48b4fb8e5fc0d33453bc6e76b83e4d0b396. Change-Id: I6fa8d915a688cde649727b3a8bf0838158ae0c0c
* | | | Import translations. DO NOT MERGEBill Yi2016-12-0380-12480/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb0981029b55c1f69f215339de85869ad9e08e84 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGE am: 538f6fe844 -s ours am: 9c376d51a4 -s ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: a4cc0970b3 -s ours Change-Id: I4dd5b53ed4228fb24caa540c9d40b05c1915f7e2
| * | | Import translations. DO NOT MERGE am: 538f6fe844 -s oursBill Yi2016-11-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 9c376d51a4 -s ours Change-Id: I6dfa20687c41f75ab08c204a9230800b07632582
| | * \ \ Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | am: 538f6fe844 -s ours Change-Id: I4be913110c35427fc7423c4cdad59fb97ff9d464
| | | * | Import translations. DO NOT MERGEBill Yi2016-11-2011-33/+33
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: I73b2c2e507b1e587d9352f5a4e144b64673cc3e4
* | | | Import translations. DO NOT MERGE am: 503656d5fe -s oursBill Yi2016-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: 15406ec897 -s ours Change-Id: Ied1a2bc511b3b9403607890a25d8c95e88162b65
| * | | Import translations. DO NOT MERGEBill Yi2016-11-050-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | am: 503656d5fe -s ours Change-Id: I0477fd88edd82ef297355161453965d45fa52221
| | * Import translations. DO NOT MERGEBill Yi2016-11-041-4/+4
| | | | | | | | | | | | | | | Change-Id: I4f686c3459735f47766f8ff0214361f69f2c5aac Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-10-261-2/+2
| | | | | | | | | | | | | | | Change-Id: I97bdf8ba1d339d1da8eff121968dbf98e5857e37 Auto-generated-cl: translation import
* | | Merge "Bump API to match dependencies." am: 706ab5cdf4 am: af4651e742 am: ↵Dan Albert2016-08-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | fa974e1e46 am: 7e1201e44b Change-Id: I2ad1b191e5e7bec04514e47676f60c236823a462
| * | Merge "Bump API to match dependencies." am: 706ab5cdf4 am: af4651e742Dan Albert2016-08-181-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | am: fa974e1e46 Change-Id: I43909dca93d2ffefee157786b6dcf63ef937dc46
| | * \ Merge "Bump API to match dependencies." am: 706ab5cdf4Dan Albert2016-08-181-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: af4651e742 Change-Id: I25c20ce92bc77db0e590754ccf050ceb2ebdbe4b
| | | * \ Merge "Bump API to match dependencies."Dan Albert2016-08-181-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 706ab5cdf4 Change-Id: I664ecf42e7dc31a91e48d2562fb0d13f201ca8f0
| | | | * \ Merge "Bump API to match dependencies."Treehugger Robot2016-08-181-1/+1
| | | | |\ \
| | | | | * | Bump API to match dependencies.Dan Albert2016-08-111-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libjpeg_static_ndk is built against 17, so we need to be built against at least that. Test: mma Bug: None Change-Id: I6c3697010e308f04c629118c6a63f614d87b3409
* | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ↵Bill Yi2016-08-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 86ce04b6e0 -s ours am: 10d2fa1ab5 -s ours am: c32f5a7828 -s ours Change-Id: Icba6165b4f29f4945b17b9dc694ddff877054555
| * | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ↵Bill Yi2016-08-050-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 86ce04b6e0 -s ours am: 10d2fa1ab5 -s ours Change-Id: I8a7a1997f180dbb00f1d73bac7697419d5de3f4d
| | * | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s oursBill Yi2016-08-050-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 86ce04b6e0 -s ours Change-Id: I5fc1263b33bd46044de5d9c3576d190983b5e20a
| | | * \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-08-050-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: aa97eb008e -s ours Change-Id: I6ca238a1467cf11050f28a8254beba786148b830
* | | | | | | | Import translations. DO NOT MERGE am: a9d39db63b -s ours am: da3f395420 -s ↵Bill Yi2016-08-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: a68b3e37d7 -s ours am: 99f7849f3d -s ours Change-Id: I36777dba90d7952a82da7079d92f3377a2e60694
| * | | | | | | Import translations. DO NOT MERGE am: a9d39db63b -s ours am: da3f395420 -s ↵Bill Yi2016-08-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: a68b3e37d7 -s ours Change-Id: I6314a8fc73de504117fa4576c671dc99e1b80bca
| | * | | | | | Import translations. DO NOT MERGE am: a9d39db63b -s oursBill Yi2016-08-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: da3f395420 -s ours Change-Id: Ida0a4fc466a3d363f3d054b23f834fc9a5e6f38c
| | | * | | | | Import translations. DO NOT MERGEBill Yi2016-08-050-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9d39db63b -s ours Change-Id: I2dc389e14299d844bd9d53e12bada021988ec220
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7 ↵Bill Yi2016-08-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: acb237644c -s ours am: eb4bd930d8 -s ours Change-Id: I08944b2433ac71b1c950baaf43c91865dece6df8
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7 ↵Bill Yi2016-08-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: acb237644c -s ours Change-Id: I5ab7471088651c3dd11c48abc495c73e826a1f5b
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-12 08:23:13 +0000