summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-08-18Convert frameworks/opt/chips to Android.bpandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseColin Cross
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3Xin Li
2018-08-04Import translations. DO NOT MERGEtemp_p_mergeBill Yi
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
2018-04-16[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af10c sk...Bill Yi
2018-04-16[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af10c sk...android-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-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devBill Yi
2018-04-16[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af10c sk...Bill Yi
2018-04-16[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af10c sk...Bill Yi
2018-04-16Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES. am: 4a0849290eDario Freni
2018-04-16Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES.Dario Freni
2018-04-16[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af10c sk...Android Build Merger (Role)
2018-04-16[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af10cAndroid Build Merger (Role)
2018-04-16Import translations. DO NOT MERGEBill Yi
2018-04-14Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES.android-wear-p-preview-2android-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-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8Dario Freni
2018-04-02[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi
2018-04-02[automerger skipped] Import translations. DO NOT MERGEBill Yi
2018-04-02Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2018-04-01Import translations. DO NOT MERGEBill Yi
2018-03-31Import translations. DO NOT MERGEBill Yi
2018-03-06Import translations. DO NOT MERGEBill Yi
2018-03-06Import translations. DO NOT MERGEBill Yi
2018-02-26Import translations. DO NOT MERGEBill Yi
2018-02-22Import translations. DO NOT MERGEBill Yi
2018-01-26Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 28a1c15d04 -s ...Bill Yi
2018-01-26Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi
2018-01-26Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot
2018-01-26[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f78 sk...Android Build Merger (Role)
2018-01-26[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f78 sk...Android Build Merger (Role)
2018-01-26[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f78 sk...Android Build Merger (Role)
2018-01-26[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f78 sk...Android Build Merger (Role)
2018-01-26Import translations. DO NOT MERGEBill Yi
2018-01-26[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f78 sk...Android Build Merger (Role)
2018-01-26[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f78Android Build Merger (Role)
2018-01-26Import translations. DO NOT MERGEBill Yi
2018-01-18Import translations. DO NOT MERGEBill Yi
2018-01-10Import translations. DO NOT MERGEBill Yi
2017-12-15Add android.test.base/stubs dependencyPaul Duffin
2017-12-08Merge "Stop statically including legacy-android-test"TreeHugger Robot
2017-12-08Stop statically including legacy-android-testPaul Duffin
2017-12-07Manually merge changes from giant AOSP topicStephen Li
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: fab947e3a7 -s oursXin Li
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterandroid-wear-8.0.0_r1android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7Xin Li
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
2017-11-14Fix import of android-support-annotationsAurimas Liutikas
2017-11-13Merge commit '059f474e2081b2e959ec3889a32b68db236aa221' into HEADXin Li
2017-11-13Fix import of android-support-annotationsAurimas Liutikas
2017-10-20Import translations. DO NOT MERGE am: 6804c987e2 -s ours am: ebe2b12027 -s ...Bill Yi
2017-10-20Import translations. DO NOT MERGE am: 6804c987e2 -s oursBill Yi