Merge "Don't run disable_ld_config_file test on non-production devices" am: 7f9f1b6f91 am: e1c82be90b

am: eb9a6a25e3  -s ours

Change-Id: I211c03c6d238fb38900cc8bcbc2f91808c0ea3a5
This commit is contained in:
Jiyong Park 2017-08-31 00:23:39 +00:00 committed by android-build-merger
commit 77d61920f6

Diff content is not available