OSDN Git Service

am 977a3313: Merge changes Iac00ce10,I192d3825
authorColin Cross <ccross@android.com>
Tue, 18 Jun 2013 01:21:37 +0000 (18:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Jun 2013 01:21:37 +0000 (18:21 -0700)
* commit '977a33137d2be0093f474055f839cf665b82b588':
  bionic: add tests for properties
  bionic: move system property writing from init to bionic

1  2 
libc/netbsd/resolv/res_state.c

Simple merge