OSDN Git Service

Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" into...
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 13 Oct 2016 00:44:58 +0000 (00:44 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 13 Oct 2016 00:44:59 +0000 (00:44 +0000)

Trivial merge