Merge "Fixed a bug in sms stress test"
am: fa5c9467d2

Change-Id: Ic8a666aa8ac2d924278fcac0ccbc92f3d36f5905
tree: a8322bce70a88ea89c6340a6ddfb1e3352da04d6
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg