tree ac575c56dd0676f361afaaba2c00c367db68dfb8
parent 61dc64f38b2669a9e1599bc5595b760f31f586f7
parent 449988872be61f273c91db13069d5b7172429032
author Chris Warrington <cmw@google.com> 1423598848 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423598848 +0000

am 44998887: am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev

* commit '449988872be61f273c91db13069d5b7172429032':
  Fix AAPT daemon mode with paths containg spaces.