Commit 1d99140e authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 659eb65c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 

* commit '659eb65c':
  CTS: whitelist /dev/pts
  Revert "Add extra conditions to test HeaderListViewAdapter isEmpty"
parents c87cac7d 659eb65c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment