tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent e50c6f1decfb63167eade6600450923ed1386840
parent 5465377737c455c06506cbee825d25a19452c24b
author Badash <badash@google.com> 1508544056 +0000
committer android-build-merger <android-build-merger@google.com> 1508544056 +0000

DO NOT MERGE Initial STS commit am: 670e858d0a  -s ours am: 2d114c5114
am: 5465377737

Change-Id: Ic11cde0466008e68f843be4446b21e4fe8e498aa