summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importlineage-16.0Michael W2020-03-286-5/+18
| | | | Change-Id: I50d4b4f245e01a5c7418852311c0281015d3a463
* Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-pie-gsiLuca Stefani2019-07-130-0/+0
|\ | | | | | | | | | | * aosp/pie-gsi: Change-Id: I71ec57489123f633c0519a225b8caa7e5f426616
| * Merge "Snap for 5622519 from e898a916f8acbd53a907c6cd1c72f5531f05457e to ↵Android Merger2019-07-090-0/+0
| |\ | | | | | | | | | pi-platform-release am: 447a368017" into pie-gsi
| | * Snap for 5622519 from e898a916f8acbd53a907c6cd1c72f5531f05457e to ↵android-build-team Robot2019-07-090-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 447a368017 Change-Id: I79fbe27f817177ec5f0f115f8d89c5aceaec4411
| | * Snap for 5622519 from e898a916f8acbd53a907c6cd1c72f5531f05457e to ↵android-build-team Robot2019-07-080-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: Ic87f9edaa151b1281e6cb728beedfb12bdec202a
| | | * Snap for 5335558 from 0a2ed801db88b2d1dbd3dac03f41e451ea8dc9b6 to ↵android-build-team Robot2019-02-261-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I7e5d09ecc76654a28d91fe4a144c51f9f4dd0e0c
| * | | \ Merge "Snap for 5450365 from 8865f025034e8094b2d61508b2618c9733a3909b to ↵Android Merger2019-05-131-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | pi-platform-release am: 61e9982423" into pie-gsi
| | * | | | Snap for 5450365 from 8865f025034e8094b2d61508b2618c9733a3909b to ↵android-build-team Robot2019-05-131-2/+2
| |/| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 61e9982423 Change-Id: I5647b065856d876d39ee8fccb1162ff7aafa66a2
| | * | | Snap for 5450365 from 8865f025034e8094b2d61508b2618c9733a3909b to ↵android-build-team Robot2019-05-071-2/+2
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I4149c7237dfbe0eb0f3f4dbc3481459a5872961a
* | | | | Merge tag 'android-9.0.0_r37' into staging/lineage-16.0_merge-android-9.0.0_r37Kevin F. Haggerty2019-05-061-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 37 (PQ3A.190505.002) * tag 'android-9.0.0_r37': Import translations. DO NOT MERGE Change-Id: I9761b1d6995513f7f42e51f171289c6df94a8dbe
| * | | | Snap for 5339334 from 0a2ed801db88b2d1dbd3dac03f41e451ea8dc9b6 to ↵android-build-team Robot2019-02-271-2/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | pi-qpr3-release Change-Id: I8c53537f9c19c2cce434a8fc56884b846dcb86ec
| | * | Import translations. DO NOT MERGEBill Yi2019-02-211-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I3666c7b6597c018e2484544a7d13ebcac58880a6
* | | Automatic translation importMichael W2019-03-1121-312/+0
| | | | | | | | | | | | Change-Id: I84ca0c82e876bc8a636a94969cde033ec58fff4d
* | | Automatic translation importMichael Bestas2019-02-262-40/+0
| | | | | | | | | | | | Change-Id: I4f17a7eb2fbd09172583604911feeaa7423793f7
* | | Automatic translation importMichael Bestas2019-01-1223-0/+471
| |/ |/| | | | | Change-Id: I30a36c765f3832373b7ce2083ad98b2d3bbce85d
* | Snap for 4778776 from 365656b09772f78cc990086e3eebd904f18a4abd to pi-releaseandroid-build-team Robot2018-05-132-2/+2
|\| | | | | | | Change-Id: I0fbb8e96a1130099a227d96cc857a4fa92bcb24f
| * Import translations. DO NOT MERGEBill Yi2018-05-122-2/+2
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Icd3fce647bfb793d3ce65794e292ff82ff8cb73a
* | Snap for 4620899 from 72ebbaa60875b0f95bab23ac2cd2f964f20b89bd to pi-releaseandroid-build-team Robot2018-02-253-0/+43
|\| | | | | | | Change-Id: If6506c1ae4c94d894ecbcfee7c7bf2f35c9004f5
| * Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible." ↵Anton Hansson2018-02-231-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | am: 6269ad665f am: eb7744a6da am: d5ae525b42 Change-Id: I1059fc2b2d8a9fd8247644099e825b5421da0d2b
| | * Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible." ↵Anton Hansson2018-02-231-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6269ad665f am: eb7744a6da Change-Id: I79556265ed5b0716b5a874affc6a431cd1d7e1ec
| | | * Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible."Anton Hansson2018-02-231-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 6269ad665f Change-Id: I4de04771fe82fc953cb1d16a36c073d0f18aa514
| | | | * Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible."Anton Hansson2018-02-231-0/+1
| | | |/|
| | | | * packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible.Anton Hansson2018-02-221-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: I96dafb07cef56c70f01ced8d5b5b8a71d2773a1f
| * | | Import translations. DO NOT MERGEBill Yi2018-02-212-0/+42
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib3709a0501dd6fd3904f628826ce56afed7c4031 Auto-generated-cl: translation import
* | | | Snap for 4611397 from 5133d985daa4ca0354d2df4a1ca249c42b2cf78b to pi-releaseandroid-build-team Robot2018-02-190-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I4d829a6434e8d5f4bde54dc9b63f8b3dab90ebd5
| * | | Import translations. DO NOT MERGE am: 40a574a026 -s oursBill Yi2018-02-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: fc79778123 -s ours Change-Id: Ic4b142d0da6c164e38a8153f5bf4f775ad3e54fb
| | * | Import translations. DO NOT MERGEBill Yi2018-02-180-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 40a574a026 -s ours Change-Id: Ia7e87ac1ff3c4f13910ca43dc514d1412da07396
| | | * | Import translations. DO NOT MERGEBill Yi2018-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I27bba143157131b31e2a79e2d13222f772fca4fb
* | | | | Snap for 4605948 from c3441bcb11dc414911dd5681fd01ca1d2dde74d2 to pi-releaseandroid-build-team Robot2018-02-152-25/+19
|\| | | | | | | | | | | | | | | | | | | Change-Id: I1aae93bc105838eebcfa34917742f52f8c4d24f9
| * | | | Switch Colors screensaver from a texture view to a surface view.Leif Hendrik Wilden2018-02-132-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Verified screensaver renders properly on ATV. Bug: 69978677 Change-Id: I04a947b1cfda6fbeeb3d2847ab7874cee886a90f
* | | | | Snap for 4585119 from 0adef8f9615dcd62bfbe1a611cdbb2b0d5aea8a9 to pi-releaseandroid-build-team Robot2018-02-051-1/+1
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ic8f928a5e24cf21837829120d7ca7d9d06752cb3
| * | | | Import translations. DO NOT MERGEBill Yi2018-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4841a056edcd39afd3e318e09536bf3d853f8598 Auto-generated-cl: translation import
* | | | | Snap for 4571561 from 405bec6834ea3e09595f50618557aaaccd0e23d5 to pi-releaseandroid-build-team Robot2018-01-280-0/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ib6c92b5e9a4e63cf35717f161a8f25025d109c20
| * | | | Import translations. DO NOT MERGE am: 5fa660660b -s oursBill Yi2018-01-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c48b6d2b8f -s ours Change-Id: Ie0f9dc2e89708e6d5f6b116e260412ce3aa4ef6e
| | * | | Import translations. DO NOT MERGEBill Yi2018-01-270-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5fa660660b -s ours Change-Id: Ic0dfbc983494d872f3d0c9eee37d2f7a4a952d41
| | | * | Import translations. DO NOT MERGEBill Yi2018-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I2458100d22ba8a2437e48e401f14dff35dff8a02
* | | | | Snap for 4510491 from 593eb0a52527c772a8121fab98c0bbdff336e6ce to pi-releaseandroid-build-team Robot2017-12-201-1/+1
|\| | | | | | | | | | | | | | | | | | | Change-Id: I234bab9faa0294405866d723a6fd431c10a3df58
| * | | | Import translations. DO NOT MERGEBill Yi2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6fbc6c8b5f9f60f2e9f2018741a04b76b666226f Auto-generated-cl: translation import
* | | | | Snap for 4453288 from cb0778a70d68f9f6196bbd867326cbdc4519651a to pi-releaseandroid-build-team Robot2017-11-150-0/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: I628f3208f2827faf1d2facbf14fa2672a9ebf516
| * | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 821df7c1b9 Change-Id: I5e1c787ecafc25153117e704097216f582c2a1c8
| | * | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-140-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I60f9fc796c626719cf275eb6ba8344dca88c1eb9
| | | * | Merge commit 'a973c2e7ac85a0414c439f542a4999d5e272cb0c' into HEADXin Li2017-11-130-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: Id821d367536798f69c5364f93da02d9f8af5c278
* | | | | | Snap for 4410151 from 96975bdd42d9d92869720e00452524027064f236 to pi-releaseandroid-build-team Robot2017-10-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idad0a54e41a315b254bcc23b45c494f7fdaea90b
| * | | | | Import translations. DO NOT MERGE am: 46ab2614d5 -s ours am: 456db3f2fe -s ↵Bill Yi2017-10-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 7259f5e0b0 -s ours Change-Id: I8aee59fe87330f4f9181de308f676d8d09ffffb8
| | * | | | Import translations. DO NOT MERGE am: 46ab2614d5 -s oursBill Yi2017-10-200-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | am: 456db3f2fe -s ours Change-Id: Iea030d6ecc61b91f13eaa9a136e5632a3518ba35
| | | * | | Import translations. DO NOT MERGEBill Yi2017-10-200-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 46ab2614d5 -s ours Change-Id: I8e3c0b13f78d2c9f21c617c41c0a83cb6c811a3f
| | | | * | Import translations. DO NOT MERGEBill Yi2017-10-202-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: I5778a80e826e6d5e7948ed7516f3207d59a41c52
* | | | | Snap for 4373608 from 5f9e0ffc24be429f60db5bdfd21e6898942603f1 to pi-releaseandroid-build-team Robot2017-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: I98f3c335186e9c69a9194e407ea66c9fbd7599d6
| * | | | Import translations. DO NOT MERGE am: 66eb6309c5 -s oursBill Yi2017-09-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a973c2e7ac -s ours Change-Id: I25b40fed59e2fc0ff0c7c3a12573092747e1ae35
| | * | | Import translations. DO NOT MERGEBill Yi2017-09-160-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | am: 66eb6309c5 -s ours Change-Id: I0745f80211f059c420bea157516c89544ac4f80b