tree cc1a6bc29892dfe174fba8b96dbf1eb46378a367
parent d402389290eeef86be7eb9241e20fdd125d44eb1
parent 4d2d5244d68e907feb58167b3ee9b40288927247
author Paul Crowley <paulcrowley@google.com> 1462918369 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462918369 +0000

Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev