Merge "Naming errors of Android device object are fixed."
tree: afaf6ac0fa95fa7a47869494b19917d21d8fb4cf
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg