commit | d50f22f754b430a2a20af2efbdfd97757cafa0f1 | [log] [tgz] |
---|---|---|
author | Dimitry Ivanov <dimitry@google.com> | Wed May 11 05:08:15 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 11 05:08:15 2016 +0000 |
tree | 36b86c60ad4b74c56c2b1cda47eeace6eeb0332a | |
parent | 503066821f9812bc16a1a1ff163d1a1731060442 [diff] | |
parent | 5556531316ecf0dcf38512a0b4018a058d24d687 [diff] |
Merge "Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev am: 6edd0c3a68 am: d7cbb6f053" into nyc-mr1-dev-plus-aosp am: f5fe79ed47 * commit 'f5fe79ed470d579b5fcd1e1b471288e1e63cdfad': Change-Id: I0495c815b6dc73c749b26edfcf13e1b29e6593e2