commit | fc592066a7f9a15b39a2184bd8f919ff14bfca2b | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 10 22:20:17 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 10 22:20:17 2016 +0000 |
tree | a29f512a279c5efe4ac452e68e34f24793ea8621 | |
parent | b0f2d02d49dcb526426b2b590a53b80ff47c785d [diff] | |
parent | 7678f7e8e9f5730aad9e875d77bc558d03b48ee2 [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