summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* release-request-951b3a8b-6c0c-4d2e-8af4-1c3f7e209f66-for-git_oc-release-4006 ↵lineage-15.0android-build-team Robot2017-05-144-5/+5
|\ | | | | | | | | | | 899 snap-temp-L39600000063784275 Change-Id: I00d14e46e359d68b75bd9eb1e1f81d90f5cd5d61
| * Import translations. DO NOT MERGEBill Yi2017-05-114-5/+5
| | | | | | | | | | Change-Id: Id40cf1ef4206ebb4d3c92a91aed30103a4eb6025 Auto-generated-cl: translation import
* | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
|\ \
| * \ merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| |\ \
| | * | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| |/| | |/|/ /
| * | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| |\ \ | |/ / |/| |
* | | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
|\| |
| * | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| |\ \ | |/ / |/| |
* | | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-030-0/+0
|\| | | |/ |/|
| * merge in oc-release history after reset to ↵gitbuildkicker2017-05-030-0/+0
| |\ | |/ |/| | | 58c8cac130dc53343067526b9acdbfffcabbcfec
* | Merge "Use AAPT2" into oc-devTreeHugger Robot2017-05-021-10/+3
|\ \ | |/ |/|
| * Use AAPT2Alan Viverette2017-04-261-10/+3
| | | | | | | | | | Test: make checkbuild Change-Id: I131c586f4813b66b38c7ce0e6a9e01728fb38b39
* | Import translations. DO NOT MERGEBill Yi2017-04-301-1/+1
|/ | | | | Change-Id: Id51ee19520b0e95fe790411cf04962e1f1cbc4e4 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-02-221-1/+1
| | | | | Change-Id: Ia06170e1178d5d5d451ec2aa6d179ad9f5d860ae Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-02-161-2/+2
| | | | | Change-Id: Id340400cbfe6aa7ddeefebe13931b41f39d9e2e4 Auto-generated-cl: translation import
* Import translations. DO NOT MERGE am: fa8e0e722b -s oursBill Yi2017-02-160-0/+0
|\ | | | | | | | | | | am: 460465f585 -s ours Change-Id: I35f8ec952eb3786a064e5b2c3944823ff89f11b1
| * Import translations. DO NOT MERGEBill Yi2017-02-160-0/+0
| |\ | | | | | | | | | | | | | | | am: fa8e0e722b -s ours Change-Id: Iba4c3d363140ccae540cbcbe47eeac262c2a671d
| | * Import translations. DO NOT MERGEBill Yi2017-02-151-2/+2
| | | | | | | | | | | | | | | Change-Id: I3febc904e60fac9b4329516c1f550093a74e44c1 Auto-generated-cl: translation import
* | | Merge "Add missing transitive dependencies" am: ff615e320f am: 5f72eb1464 ↵Colin Cross2017-02-151-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | am: ab0c9e6564 am: 2cf34c9556 Change-Id: I3eae8148ce1304c763bdd85a2a42258a463cbb61
| * | Merge "Add missing transitive dependencies" am: ff615e320f am: 5f72eb1464Colin Cross2017-02-151-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | am: ab0c9e6564 Change-Id: I19a82cfb8850c15f749f3313ded4f7fa944715be
| | * \ Merge "Add missing transitive dependencies" am: ff615e320fColin Cross2017-02-151-2/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 5f72eb1464 Change-Id: Id735fba8af2e16ee1e851684e963100830785230
| | | * \ Merge "Add missing transitive dependencies"Colin Cross2017-02-151-2/+6
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ff615e320f Change-Id: I2ee95031f0ae8d8c274daf60bde09fb2edc480ae
| | | | * | Merge "Add missing transitive dependencies"Treehugger Robot2017-02-151-2/+6
| | | |/| |
| | | | * | Add missing transitive dependenciesColin Cross2017-02-151-2/+6
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing transitive dependencies for android-support-design. Test: m -j checkbuild tests cts Change-Id: Id211965d69ad2aa208d1168751f119d2ec9b83c4
* | | | | Import translations. DO NOT MERGE am: f42c8e0216 -s oursBill Yi2017-02-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 947836e724 -s ours Change-Id: I76aad45b9c69d3d6a09d2d7383144ba50b89b4f6
| * | | | Import translations. DO NOT MERGEBill Yi2017-02-030-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | am: f42c8e0216 -s ours Change-Id: I77a1852d350e11dcc94ceb7ea4fecb28b5c0e9fc
| | * | | Import translations. DO NOT MERGEBill Yi2017-02-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I395b479a89e7562592582e459efe6fa3593d068a Auto-generated-cl: translation import
* | | | | Rename language+country resources to just languageRoozbeh Pournader2017-01-1030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26496609 Test: none Change-Id: I466dfb05dcd300c38ec20891856274208e9ee59d
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-12-221-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0195ed7a8ba0c34b7808582879efc3a799d779f Auto-generated-cl: translation import
* | | | | | Prompt wp destination when system imagery can migrate to lock. am: 777ac7df69John Heroy2016-12-221-2/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | am: 6ce0be8ccf Change-Id: I04b450ee34383e901b3a45bc290ba05e3072b6f3
| * | | | Prompt wp destination when system imagery can migrate to lock.John Heroy2016-12-221-2/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 777ac7df69 Change-Id: Ia3cf6d7244a2f59c1d65ddf28f2a371cf9963e7f
| | * | | Prompt wp destination when system imagery can migrate to lock.John Heroy2016-12-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WallpaperManager#setWallpaperComponent migrates system wallpaper imagery to lock, so now LivePicker should ask for a live wallpaper destination except when there's a live wallpaper set and there's no lock wallpaper imagery. Bug: 32670638 Fixed: 32670638 Test: Set a static wallpaper to system+lock, then try to set a live wallpaper and observe that LivePicker prompts the user for a destination. Change-Id: I39767b592c5a91c06670d6d00af90069b5c8e353
* | | | | Import translations. DO NOT MERGEBill Yi2016-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id354a48ce6eaddc3ee55f69752da3675dc436342 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGE am: d7e58d608a -s ours am: f8eadaee18 -s ↵Bill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 034b5a865f -s ours Change-Id: Ibc3c3e8acf44c3abe5b32eb38d3655e09a27abad
| * | | | Import translations. DO NOT MERGE am: d7e58d608a -s oursBill Yi2016-11-210-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | am: f8eadaee18 -s ours Change-Id: Ia5ff8bd47f2be5bd7b0b814874bbed7c11a96097
| | * | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | am: d7e58d608a -s ours Change-Id: Ia4c04753bfee4384917ae71e415b1a56ad197db1
| | | * | Import translations. DO NOT MERGEBill Yi2016-11-2077-13/+353
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: Iacedc7ffcd88e1496a736d319db559654bf5b825
* | | | Import translations. DO NOT MERGE am: 9e60e91d6a -s oursBill Yi2016-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: d92f21bbb0 -s ours Change-Id: I5b970e2150866385921e681f21ab599bdaaf93e5
| * | | Import translations. DO NOT MERGEBill Yi2016-11-050-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | am: 9e60e91d6a -s ours Change-Id: I4900627a128d8d978cd8722c6fa715c5df1031f8
| | * Import translations. DO NOT MERGEBill Yi2016-11-042-2/+2
| | | | | | | | | | | | | | | Change-Id: I0caa265fe05cfaeae4c878da53fcf03cbeaa87a2 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGE am: 2645dade1f -s ours am: 0c5800e18d -s ↵Bill Yi2016-09-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | ours am: 0bfa43aa48 -s ours am: 82b4c35f66 -s ours Change-Id: I464cfb09e918eaf0685fabde3c619c1d99ad1f8d
| * | Import translations. DO NOT MERGE am: 2645dade1f -s ours am: 0c5800e18d -s ↵Bill Yi2016-09-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | ours am: 0bfa43aa48 -s ours Change-Id: Ia462053df73d1b9aaa39a81d5ab695dbb6f3aea7
| | * Import translations. DO NOT MERGE am: 2645dade1f -s oursBill Yi2016-09-170-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 0c5800e18d -s ours Change-Id: I804d577c05989215c3e405a63428258260ffbc78
| | | * Import translations. DO NOT MERGEBill Yi2016-09-170-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 2645dade1f -s ours Change-Id: Iefa956121e350c78817cfd7c45c685b1d4c54887
| | | | * Import translations. DO NOT MERGEBill Yi2016-09-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 31516661 Change-Id: I4ff0de0cda137102944ba60f809c50331acdbcee
* | | | | Import translations. DO NOT MERGE am: 98d4aea6e1 -s ours am: a524308cde -s ↵Bill Yi2016-08-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b820d5c247 -s ours Change-Id: I4cb1cf619ff4c7389f6d4d5752a5b67d39aa3b5e
| * | | | Import translations. DO NOT MERGE am: 98d4aea6e1 -s oursBill Yi2016-08-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a524308cde -s ours Change-Id: I6f16d8aecae7d9cb356cae82fec65f149f3a4cfd
| | * | | Import translations. DO NOT MERGEBill Yi2016-08-220-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 98d4aea6e1 -s ours Change-Id: If13c10dffd0a476f2f4c3d8ac718cc1e7c0ef232
| | | * | Import translations. DO NOT MERGEBill Yi2016-08-192-2/+2
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I55efbdea96c99f057d10c5cd24604895a02acb93 Auto-generated-cl: translation import