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)
commit552da14efd971943a73f3f480f0db5673ab58d8d
tree0a7bf4c0ee2a3304e782e95dec937c1acc5801c3
parent0b1be22ee8ba2e59f962e3edde03829ae99db3f8
parent207522c39f0c128b2b0136e99c2292400b51f134
am 207522c3: (-s ours) Improvements to standalone Android build scripts automerge: 7e01a41

* commit '207522c39f0c128b2b0136e99c2292400b51f134':
  Improvements to standalone Android build scripts