summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li2018-08-064-5/+44
|\
| * Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-084-5/+44
| |\
| | * Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-de...Atanas Kirilov2018-06-012-0/+35
| | |\
| | | * Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-de...android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devAtanas Kirilov2018-06-012-0/+35
| | | |\
| | | | * Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-de...Atanas Kirilov2018-06-012-0/+35
| | | | |\
| | | | | * Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-devAtanas Kirilov2018-05-312-0/+35
| | | | | |\
| | | | | | * Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-devAtanas Kirilov2018-06-012-0/+35
| | | | | | |\
| | | | | | | * [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am:...Android Build Merger (Role)2018-05-252-0/+35
| | | | | | | |\
| | | | | | | | * [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am:...Android Build Merger (Role)2018-05-252-0/+35
| | | | | | | | |\
| | | | | | | | | * [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am:...Android Build Merger (Role)2018-05-252-0/+35
| | | | | | | | | |\
| | | | | | | | | | * [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am:...Android Build Merger (Role)2018-05-252-0/+35
| | | | | | | | | | |\
| | | | | | | | | | | * [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182Android Build Merger (Role)2018-05-252-0/+35
| | | | | | | | | | | |\
| | | | | | | | | | | | * Messaging ignores file URIs shared via intentDavid Smith2018-05-252-0/+35
| | * | | | | | | | | | | [automerger skipped] [automerger] RESTRICT AUTOMERGE: Messaging ignores file ...David Smith2018-06-010-0/+0
| | |\| | | | | | | | | |
| | | * | | | | | | | | | [automerger skipped] [automerger] RESTRICT AUTOMERGE: Messaging ignores file ...David Smith2018-06-010-0/+0
| | | |\| | | | | | | | |
| | | | * | | | | | | | | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...David Smith2018-06-010-0/+0
| | | | |\| | | | | | | |
| | | | | * | | | | | | | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...David Smith2018-05-310-0/+0
| | | | | |\| | | | | | |
| | | | | | * | | | | | | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-250-0/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | |
| | | | | | | * | | | | | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-250-0/+0
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | |/| | | | |
| | | | | | | | * | | | | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-250-0/+0
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | |/| | | |
| | | | | | | | | * | | | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-250-0/+0
| | | | | | | | | |\ \ \ \ | | | | | | | | | | |/ / / | | | | | | | | | |/| | |
| | | | | | | | | | * | | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-250-0/+0
| | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ / | | | | | | | | | | |/| |
| | | | | | | | | | | * | [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-250-0/+0
| | | | | | | | | | | |\ \ | | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | | | * [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-252-0/+37
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-252-0/+37
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via inten...Android Build Merger (Role)2018-05-252-0/+37
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intentDavid Smith2018-05-252-0/+37
| | * | | | | | | | | | | | | | [automerger skipped] Migrate messaging to aapt2. am: a75d7022fcAurimas Liutikas2018-05-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Migrate messaging to aapt2.Aurimas Liutikas2018-05-071-32/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Migrate messaging to aapt2.android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1Aurimas Liutikas2018-04-251-32/+23
| | * | | | | | | | | | | | | Merge "Revert "Enable content observer notifications even for default SMS app...Vasu Nori2018-02-281-9/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Revert "Enable content observer notifications even for default SMS app, when ...Vasu Nori2018-02-281-9/+0
| | * | | | | | | | | | | | | | Merge "Enable content observer notifications even for default SMS app, when t...Vasu Nori2018-02-231-0/+9
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Enable content observer notifications even for default SMS app, when theVasu Nori2018-02-151-0/+9
| | * | | | | | | | | | | | | | Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99 am: 38dea40340Nan Zhang2018-02-221-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99Nan Zhang2018-02-221-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use HAS_BUILD_NUMBER to check engineering buildNan Zhang2018-02-221-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Use HAS_BUILD_NUMBER to check engineering buildandroid-wear-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Nan Zhang2018-02-211-3/+3
| | * | | | | | | | | | | | | | Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b am: 2be03391bbColin Cross2017-12-281-4/+2
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74bColin Cross2017-12-281-4/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't use LOCAL_PROGUARD_ENABLED := nosystemColin Cross2017-12-281-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Don't use LOCAL_PROGUARD_ENABLED := nosystemandroid-wear-8.0.0_r1Colin Cross2017-12-271-4/+2
| | * | | | | | | | | | | | | | Merge "Add android.test.base/stubs dependency"TreeHugger Robot2017-12-151-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Add android.test.base/stubs dependencyPaul Duffin2017-12-151-1/+5
| | * | | | | | | | | | | | | | | Switch to modern ArgumentMatchers am: 13ade30481 am: 4825219c58Philip P. Moltmann2017-12-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Switch to modern ArgumentMatchers am: 13ade30481Philip P. Moltmann2017-12-153-24/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Switch to modern ArgumentMatchersPhilip P. Moltmann2017-12-153-24/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Switch to modern ArgumentMatchersPhilip P. Moltmann2017-12-143-24/+17
| | * | | | | | | | | | | | | | Merge "Switch to modern ArgumentMatchers"Philip P. Moltmann2017-12-133-24/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Switch to modern ArgumentMatchersPhilip P. Moltmann2017-12-123-24/+17