diff options
| author | Colin Cross <ccross@android.com> | 2013-07-03 15:45:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-03 15:45:16 -0700 |
| commit | 149a9b68ab09e4934556e9247ee5f98008a65662 (patch) | |
| tree | 747a6b8891d0c685d805a9c254760a46800adccb /fs_mgr/fs_mgr_priv.h | |
| parent | b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a (diff) | |
| parent | fafcabd0dd4432de3c7f5956edec23f6ed241b56 (diff) | |
| download | system_core-149a9b68ab09e4934556e9247ee5f98008a65662.tar.gz system_core-149a9b68ab09e4934556e9247ee5f98008a65662.tar.bz2 system_core-149a9b68ab09e4934556e9247ee5f98008a65662.zip | |
am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
* commit 'fafcabd0dd4432de3c7f5956edec23f6ed241b56':
Added net.dns1 prop for emulator, as Android emulator ignores it by default.
Diffstat (limited to 'fs_mgr/fs_mgr_priv.h')
0 files changed, 0 insertions, 0 deletions