tree 94cf9ba42890eacb446f44a14f158f231d8a9f25
parent 487c6cacc8443b2c92254aceb57ae9a789be0509
parent 41a57745a4bfe3709840b841b67ca9695f452286
author Badash <badash@google.com> 1508367977 +0000
committer android-build-merger <android-build-merger@google.com> 1508367977 +0000

Merge "DO NOT MERGE initial add sts to build" into nyc-dev am: b20486d397
am: 41a57745a4

Change-Id: Ib3b4ca9a5ae46735e0262a1e36c136ce3e57defe