commit | 88bed6464c30a80427e4e2f4c56147160a6b7374 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Sat Jan 28 16:55:38 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jan 28 16:55:38 2017 +0000 |
tree | 2f4582265b6a1dcb4defbe935fd37e303b16a37c | |
parent | 04303a37255ca0765462a2628d1f159f2ed602cf [diff] | |
parent | 80aa72022f960bfa6aa6b55cbfe2a3ee997356e1 [diff] |
Merge "bionic and init don't need to share knowledge of property file locations." am: 9cd890e9b7 am: 1890bd1b2e am: 6d5b37caba am: 7ea357283a Change-Id: I0f27f6bf444929f856f6ae0bec0cfc4078bf09d9