commit | 7e01619bfeeddb98f151814bf123ab19f6741b22 | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Tue May 10 22:22:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 10 22:22:46 2016 +0000 |
tree | c855021645d73f148a4b21664db6f9f8f316bce0 | |
parent | 421ffeca7c56c2d7e7e7a9de6edb0c6f3d404423 [diff] | |
parent | fc592066a7f9a15b39a2184bd8f919ff14bfca2b [diff] |
Merge "Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c am: 44ddebaac0" into nyc-mr1-dev-plus-aosp am: fc592066a7 * commit 'fc592066a7f9a15b39a2184bd8f919ff14bfca2b': Change-Id: Icbdbc5adda30a28f65f7f1a7a6719bdb5ff99dd5