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
This commit is contained in:
Paul Crowley 2016-05-10 22:22:46 +00:00 committed by android-build-merger
commit 7e01619bfe

Diff content is not available