Merge "Fixed a bug that caused a stacktrace in the IntegrationTest."
tree: e0522ad2a54f3e427dbb82eb97fac5da70b03a8c
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg