Merge commit 'e14ee540d6accf3468367f2a25a4540fd3e08051' into HEAD
tree: 102f6c500d3334af2e45e380fd2babdb39b56f7a
  1. service-t/
  2. Android.mk