tree 2f9a75fda124bb147f197590e7234d602de742bd
parent 28309597a6ff1a892ae2c2a22094f7dc7b8b4e3c
parent 850045ca27b2a71d6b1fee873dc7246edfd0b8f2
author Mark Salyzyn <salyzyn@google.com> 1449533041 +0000
committer android-build-merger <android-build-merger@google.com> 1449533041 +0000

Merge changes Ib441cecf,Ieb1bbe3d,I3e63e430,I531b4317,I8dd60545, ... am: d1379a8aed am: 154e1c15ae
am: 850045ca27

* commit '850045ca27b2a71d6b1fee873dc7246edfd0b8f2':
  logcat: Add --wrap timeout
  logcat: Add low hanging fruit long arguments
  logcat: Add long arguments to logcat, support for pid filter
  liblog: Support for ANDROID_LOG_WRAP mode flag on reader
  logd: test wakeup on wrap timeout
  logd: wakeup on wrap or timeout