tree 2b36eaf815eb1769eb5016502c0dc4c80f1d7bc5
parent 54254f5f4a790865b522832b139cef8d3e4fc7a1
parent d269f266aaa14c0504590f3250f85da5684863d6
author Badash <badash@google.com> 1512586314 +0000
committer android-build-merger <android-build-merger@google.com> 1512586314 +0000

initial add sts to build am: bb7a920294 am: b4bd17c9ad am: 2f8a8b8a18
am: d269f266aa

Change-Id: If158bd1903e9e7d828a2ad3ca471faee1f98c3b4