| commit | 2e729c351661deefca70702cb58fa65adf96020c | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Apr 05 23:14:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 05 23:14:30 2016 +0000 |
| tree | e8e2b81a6608cb86e610af8e7c47aaa520386c21 | |
| parent | 884725e89ee5d1230b0b7630e8dda011a6dffcef [diff] | |
| parent | 5a06a626544d57f596ce02e2202ac29fa9ae0034 [diff] |
Merge "ART: Don\'t attempt write flock if not zygote" am: 224b7f3 am: 0ce4ac5 am: 5a06a62 * commit '5a06a626544d57f596ce02e2202ac29fa9ae0034': ART: Don't attempt write flock if not zygote Change-Id: Idb616b78cc4519acf8ee14bf5aa7974cb25a905d