am 207522c3: (-s ours) Improvements to standalone Android build scripts automerge...
authorPyry Haulos <phaulos@google.com>
Tue, 11 Nov 2014 18:21:41 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Nov 2014 18:21:41 +0000 (18:21 +0000)
* commit '207522c39f0c128b2b0136e99c2292400b51f134':
  Improvements to standalone Android build scripts


Trivial merge