summaryrefslogtreecommitdiff
path: root/test/MultiDexModifiedSecondary/Main.java
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2016-04-05 23:11:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-05 23:11:13 +0000
commit5a06a626544d57f596ce02e2202ac29fa9ae0034 (patch)
treee8e2b81a6608cb86e610af8e7c47aaa520386c21 /test/MultiDexModifiedSecondary/Main.java
parentd6125efcac6ea62ddc316a4e62f5e535ddfbf8b3 (diff)
parent0ce4ac5a1886315fd9da992bfeae82b595e75ae3 (diff)
Merge "ART: Don\'t attempt write flock if not zygote" am: 224b7f3
am: 0ce4ac5 * commit '0ce4ac5a1886315fd9da992bfeae82b595e75ae3': ART: Don't attempt write flock if not zygote Change-Id: I1f07cfdb56c91884b1f4a23cd1fc4277f713429b
Diffstat (limited to 'test/MultiDexModifiedSecondary/Main.java')
0 files changed, 0 insertions, 0 deletions