tree 435248a8ee526f347b63121ee4fabf446994b3c4
parent 978449b0810a41f70fc4b9eb05f19aad54e189b2
parent 81d3447fa92357672d0ce2a4d914854137c801ea
author Josh Gao <jmgao@google.com> 1448938173 +0000
committer android-build-merger <android-build-merger@google.com> 1448938173 +0000

Merge changes I25bdcbc5,I12314da5,I055b0821 am: a3892504ac
am: 81d3447fa9

* commit '81d3447fa92357672d0ce2a4d914854137c801ea':
  adb: don't pull symlinks when pulling a directory
  adb: remove extraneous newline from skip message
  adb: correctly count skipped files in push/pull