diff options
| author | Paul Crowley <paulcrowley@google.com> | 2016-05-10 21:13:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-10 21:13:51 +0000 |
| commit | dd05d2d1509bd9e2b5182225d09aa13e3fdffa2c (patch) | |
| tree | c4081c15e867ba976da697d97387a17993dd5397 /rs/java/android/renderscript/ProgramStore.java | |
| parent | de224ba451547fcc139ec6c565243e0f450ece46 (diff) | |
| parent | f829c1463b4805545d15924ad6243b9405eb83d6 (diff) | |
Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
am: f829c1463b
* commit 'f829c1463b4805545d15924ad6243b9405eb83d6':
Revert "Two phases to set the password for disk encryption"
Change-Id: Ia2d8b2e751a42771cfa5fedbf47b73be6491820c
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions