tree 00246abf97c7f4a54e0b9426340b0cbc429b3b87
parent ed7d2cca462c864cedb199dd49c37f9f70254878
parent c5116a8dbeb58215a4e0acdc8db45afe50484d19
author Jordan Liu <jminjie@google.com> 1520372492 +0000
committer android-build-merger <android-build-merger@google.com> 1520372492 +0000

Merge "Update the button layouts and colors of StkInputActivity"
am: c5116a8dbe

Change-Id: I11150a03aa79f2864148e49a300ffb7264a05e2b