OSDN Git Service

am 74afb718: am 5a7ad033: Accomodate to the import syntax in build.prop.
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:30:11 +0000 (23:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:30:11 +0000 (23:30 +0000)
* commit '74afb71873e22d5489d92c3e86c71228f961d70f':


Trivial merge