OSDN Git Service

am 8bb3306b: am a1f8cdf7: Merge "Allow several system property files"
authorYing Wang <wangying@android.com>
Thu, 18 Jul 2013 17:07:09 +0000 (10:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Jul 2013 17:07:09 +0000 (10:07 -0700)
commit8bf79bb081c3abcfde29cf9223c9fc1e4bd55ce1
treeb377528067f166783222f79e11c27e4e02456817
parent0a2c858bb650f3daca550bf26d17286ecee56cd8
parent8bb3306b76bf3a20fc0f0634a492c5c18550c8e3
am 8bb3306b: am a1f8cdf7: Merge "Allow several system property files"

* commit '8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
  Allow several system property files