summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-08merge in lmp-mr1-release history after reset to 9976480a6e7fc53b40f0fe97aac29...android-cts-5.1_r2android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r3android-5.1.1_r2android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1linaro_android_5.1.1The Android Automerger
2014-11-06merge in lmp-mr1-release history after reset to 9976480a6e7fc53b40f0fe97aac29...The Android Automerger
2014-11-05Indicate that softkeymaster key blobs are standalone, meaning they don'tandroid-5.1.1_r5android-5.1.1_r12lollipop-mr1-devShawn Willden
2014-11-05merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-11-04merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-11-03merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-11-02merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-11-01merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-30merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-29merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-28merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-27merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-26merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-25merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-23merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-22merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-21merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-20merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-19merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-18merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-16merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-15merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-14merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-13merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-12merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-11merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-09merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-08merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-07merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-06merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-05merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-04merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-02merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-10-01merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-09-30merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-09-29merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-09-28merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-09-27merge in lmp-mr1-release history after reset to 90c4779146c9ac154fe85cd6a0775...The Android Automerger
2014-09-26Merge "Delete user's keys only after keystore reset" into lmp-devlollipop-devRobin Lee
2014-09-26Delete user's keys only after keystore resetRobin Lee
2014-09-25Fallback to software keystore on import_key failureKenny Root
2014-09-25merge in lmp-mr1-release history after reset to 31e27468b6d822adbd2aec9219a68...The Android Automerger
2014-09-24merge in lmp-mr1-release history after reset to 31e27468b6d822adbd2aec9219a68...The Android Automerger
2014-09-23merge in lmp-mr1-release history after reset to 31e27468b6d822adbd2aec9219a68...The Android Automerger
2014-09-23merge in lmp-mr1-release history after reset to 31e27468b6d822adbd2aec9219a68...The Android Automerger
2014-09-22merge in lmp-mr1-release history after reset to 31e27468b6d822adbd2aec9219a68...The Android Automerger
2014-09-22merge in lmp-mr1-release history after reset to 31e27468b6d822adbd2aec9219a68...The Android Automerger
2014-09-22merge in lmp-mr1-release history after reset to 31e27468b6d822adbd2aec9219a68...The Android Automerger
2014-09-15merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger
2014-09-14merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger