Merge "Fix for logcat dying in the middle of a test"
tree: a170e468fca6f0dbf9b4c2becfe581ea490410f1
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg