summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move <permission> tags to correct parent elementandroid-vts-8.0_r2android-vts-8.0_r1oreo-devAlan Viverette2017-06-051-6/+0
* 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
* | Import translations. DO NOT MERGEBill Yi2017-05-102-8/+8
|/
* Fix proguard failure when using javacAlan Viverette2017-04-271-2/+4
* Use explicit support library prebuiltsAlan Viverette2017-04-211-2/+2
* Fix build Gallery2Seigo Nonaka2017-04-191-1/+2
* Import translations. DO NOT MERGEBill Yi2017-02-211-1/+1
* Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9Paul Duffin2017-02-215-14/+12
|\
| * Merge "Stop using junit classes in production" am: f1ec8df547Paul Duffin2017-02-215-14/+12
| |\
| | * Merge "Stop using junit classes in production"Paul Duffin2017-02-215-14/+12
| |/|
| | * Merge "Stop using junit classes in production"android-o-preview-1android-n-mr2-preview-2o-previewPaul Duffin2017-02-215-14/+12
| | |\
| | | * Stop using junit classes in productionPaul Duffin2017-02-205-14/+12
| | |/
* | | Import translations. DO NOT MERGEBill Yi2017-02-162-4/+4
* | | Import translations. DO NOT MERGEBill Yi2017-02-061-1/+1
* | | Import translations. DO NOT MERGE am: bdba1ead72 -s oursBill Yi2017-02-030-0/+0
|\| |
| * | Import translations. DO NOT MERGEBill Yi2017-02-030-0/+0
| |\ \
| | * | Import translations. DO NOT MERGEandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devBill Yi2017-02-024-7/+7
* | | | Rename language+country resources to just languageRoozbeh Pournader2017-01-1040-0/+0
* | | | Import translations. DO NOT MERGEBill Yi2016-12-211-1/+1
* | | | Import translations. DO NOT MERGEBill Yi2016-12-052-5/+5
* | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0580-0/+12480
* | | | Import translations. DO NOT MERGEBill Yi2016-12-0380-12480/+0
* | | | Import translations. DO NOT MERGE am: 538f6fe844 -s ours am: 9c376d51a4 -s ...Bill Yi2016-11-210-0/+0
|\| | |
| * | | Import translations. DO NOT MERGE am: 538f6fe844 -s oursBill Yi2016-11-210-0/+0
| |\ \ \
| | * \ \ Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Import translations. DO NOT MERGEandroid-n-mr2-preview-1Bill Yi2016-11-2011-33/+33
| | |/ /
* | | | Import translations. DO NOT MERGE am: 503656d5fe -s oursBill Yi2016-11-050-0/+0
|\| | |
| * | | Import translations. DO NOT MERGEBill Yi2016-11-050-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * Import translations. DO NOT MERGEBill Yi2016-11-041-4/+4
* | | Import translations. DO NOT MERGEBill Yi2016-10-261-2/+2
* | | Merge "Bump API to match dependencies." am: 706ab5cdf4 am: af4651e742 am: fa9...Dan Albert2016-08-181-1/+1
|\| |
| * | Merge "Bump API to match dependencies." am: 706ab5cdf4 am: af4651e742Dan Albert2016-08-181-1/+1
| |\ \
| | * \ Merge "Bump API to match dependencies." am: 706ab5cdf4Dan Albert2016-08-181-1/+1
| | |\ \
| | | * \ Merge "Bump API to match dependencies."android-n-mr1-preview-2android-n-mr1-preview-1Dan Albert2016-08-181-1/+1
| | | |\ \
| | | | * \ Merge "Bump API to match dependencies."Treehugger Robot2016-08-181-1/+1
| | | | |\ \
| | | | | * | Bump API to match dependencies.Dan Albert2016-08-111-1/+1
| | | | |/ /
* | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s our...Bill Yi2016-08-050-0/+0
|\| | | | |
| * | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s our...Bill Yi2016-08-050-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s oursBill Yi2016-08-050-0/+0
| | |\ \ \ \
| | | * \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-devandroid-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseBill Yi2016-08-050-0/+0
| | | |\ \ \ \
* | | | | | | | Import translations. DO NOT MERGE am: a9d39db63b -s ours am: da3f395420 -s ...Bill Yi2016-08-050-0/+0
|\| | | | | | |
| * | | | | | | Import translations. DO NOT MERGE am: a9d39db63b -s ours am: da3f395420 -s ...Bill Yi2016-08-050-0/+0
| |\| | | | | |
| | * | | | | | Import translations. DO NOT MERGE am: a9d39db63b -s oursBill Yi2016-08-050-0/+0
| | |\| | | | |
| | | * | | | | Import translations. DO NOT MERGEBill Yi2016-08-050-0/+0
| | | |\ \ \ \ \
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7 -s...Bill Yi2016-08-050-0/+0
|\| | | | | | | |
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7 -s...Bill Yi2016-08-050-0/+0
| |\| | | | | | |
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-08-050-0/+0
| | |\| | | | | |
| | | * | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-08-051-2/+2
| | | |\ \ \ \ \ \
* | | | | | | | | | Import translations. DO NOT MERGE am: c92d371104 -s ours am: c2b38be10f -s ...Bill Yi2016-08-050-0/+0
|\| | | | | | | | |