tree e93814096cec924be3d9f3343157bb30656edddd
parent 2ee6f7b95f570b2fc9fd3f07ca895db409c9adb3
parent fe3e0521f1fd1f7a12580865b9d85da15295260b
author Jordan Liu <jminjie@google.com> 1521700499 +0000
committer android-build-merger <android-build-merger@google.com> 1521700499 +0000

Merge "Finalize STK call control strings"
am: fe3e0521f1

Change-Id: Ia60f7a5b21d3cca448cc46166e4c4e5ecb0f6d53