summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-02-09merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-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_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-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_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-releaselinaro_android_5.1.1The Android Automerger
2015-02-06Revert "Make encryption configurable"android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devPaul Lawrence
2015-01-27merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-21Make encryption configurablePaul Lawrence
2014-12-03merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-02Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-devPaul Lawrence
2014-12-02Merge "Fix encrypt-and-wipe" into lmp-mr1-devPaul Lawrence
2014-12-02Do not log passwords returned through vdcPaul Lawrence
2014-12-02Fix error in clocks leading to devices staying unlockedPaul Lawrence
2014-12-02Fix encrypt-and-wipePaul Lawrence
2014-11-21fall back to dm-crypt if device already encryptedIliyan Malchev
2014-11-21Adding support of dm-req-cryptAjay Dudani
2014-11-21fall back to dm-crypt if device already encryptedIliyan Malchev
2014-11-21Adding support of dm-req-cryptAjay Dudani
2014-11-08merge in lmp-mr1-release history after reset to 7c49ab0a0b3c1ee9b24a4b0b1a2c0...The Android Automerger
2014-11-06merge in lmp-mr1-release history after reset to 7c49ab0a0b3c1ee9b24a4b0b1a2c0...The Android Automerger
2014-11-05merge in lmp-mr1-release history after reset to 13c3a90b586d272b391bd0e279571...The Android Automerger
2014-11-04Modify vold to check for hardware keymaster.Shawn Willden
2014-11-04merge in lmp-mr1-release history after reset to 13c3a90b586d272b391bd0e279571...The Android Automerger
2014-11-03merge in lmp-mr1-release history after reset to 13c3a90b586d272b391bd0e279571...The Android Automerger
2014-11-02merge in lmp-mr1-release history after reset to 13c3a90b586d272b391bd0e279571...The Android Automerger
2014-11-01merge in lmp-mr1-release history after reset to 13c3a90b586d272b391bd0e279571...The Android Automerger
2014-10-30merge in lmp-mr1-release history after reset to 13c3a90b586d272b391bd0e279571...The Android Automerger
2014-10-29Merge "Make persistent field in cryptofs support longer values." into lmp-mr1...Rubin Xu
2014-10-29merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-28merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-27merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-26merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-25merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-24Make persistent field in cryptofs support longer values.Rubin Xu
2014-10-23merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-22merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-21merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-20merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-19merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-18merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02f...The Android Automerger
2014-10-17am 512f0d52: cryptfs: [HACK] reboot if the crypto block dev failed to openJP Abgrall
2014-10-17resolved conflicts for merge of 7776871d to lmp-mr1-devJP Abgrall
2014-10-16cryptfs: [HACK] reboot if the crypto block dev failed to openlollipop-devJP Abgrall
2014-10-16merge in lmp-mr1-release history after reset to 7fc1de8a44307d6c51826ab90f804...The Android Automerger
2014-10-15merge in lmp-mr1-release history after reset to 7fc1de8a44307d6c51826ab90f804...The Android Automerger
2014-10-14merge in lmp-mr1-release history after reset to 7fc1de8a44307d6c51826ab90f804...The Android Automerger
2014-10-13merge in lmp-mr1-release history after reset to fc61504166d4377a1f83211c236ca...The Android Automerger
2014-10-12merge in lmp-mr1-release history after reset to fc61504166d4377a1f83211c236ca...The Android Automerger
2014-10-11merge in lmp-mr1-release history after reset to fc61504166d4377a1f83211c236ca...The Android Automerger
2014-10-10cryptfs: [HACK] reboot if the crypto block dev failed to openJP Abgrall
2014-10-10cryptfs: extra debugging around crypto blockdev dm-... errors.JP Abgrall
2014-10-10cryptfs: extra debugging around crypto blockdev dm-... errors.JP Abgrall
2014-10-09merge in lmp-mr1-release history after reset to fc61504166d4377a1f83211c236ca...The Android Automerger
2014-10-08merge in lmp-mr1-release history after reset to fc61504166d4377a1f83211c236ca...The Android Automerger