tree 425d51ce31392db2b0c9627bf970b1eddae81d47
parent 26642bf7bf8f645f3d10fe0d36149d5f8b3b92fb
parent cfa03d4a4c53acf41dca2c41a2efd00de06043bb
author Paul Crowley <paulcrowley@google.com> 1462918658 +0000
committer android-build-merger <android-build-merger@google.com> 1462918658 +0000

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

* commit 'cfa03d4a4c53acf41dca2c41a2efd00de06043bb':
  e4crypt_is_native has been moved into system/extras.

Change-Id: I345475c44fb2d8812a25c9f2195c748cddc55bfe