tree a29f512a279c5efe4ac452e68e34f24793ea8621
parent 8d5165ab0fbf0dcf3e639bb1dbdc11ed6c152f8b
parent 44ddebaac0465a9a88b68ca04bbb69b576a0d067
author Paul Crowley <paulcrowley@google.com> 1462918805 +0000
committer android-build-merger <android-build-merger@google.com> 1462918805 +0000

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

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

Change-Id: I02d14adeed72858771b5838e618b1fa8735ca7b1