Merge "Replace getBuildserial with serial."
am: 86bad237aa

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