| commit | 0391a1eb2964a6f7e47ad418185b697ff8e41f45 | [log] [tgz] |
|---|---|---|
| author | Alex Vakulenko <avakulenko@google.com> | Thu Oct 08 08:31:36 2015 -0700 |
| committer | Alex Vakulenko <avakulenko@google.com> | Thu Oct 08 08:31:36 2015 -0700 |
| tree | a186d46e20590e69befa75862642c7f7079ce429 | |
| parent | ec7fa135524d17649a506914f0bd7cc2c5348649 [diff] |
Port data encryption code from Brillo branch to AOSP In an effort to keep the source code differences between AOSP and Brillo, port Brillo-only changes back to AOSP and use conditional compilation to only compile the Brillo source files on Brillo. This eliminates constant merge conflicts between the branches when the source code diverges significantly. Change-Id: Ifec5cefe2fa25cbf3e239d829935d137abe63c01