OSDN Git Service

am 51f0d3f5: resolved conflicts for merge of 70555a16 to master
authorYing Wang <wangying@google.com>
Tue, 15 Apr 2014 21:02:38 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Apr 2014 21:02:38 +0000 (21:02 +0000)
* commit '51f0d3f58a5c04ee328778bc97e42dc10cfa41ad':
  Allow to build target-files.zip in sdk build.


Trivial merge