OSDN Git Service

Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
authorFan Zhang <zhfan@google.com>
Wed, 4 May 2016 18:03:42 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 18:03:42 +0000 (18:03 +0000)
commitaa21c1b07af088ac1d106ebad91016dd1fcc29ca
tree5486364442432ee6fcf7232ddb4a1d20ba242072
parentff74ebff5ad4368411b5641670363658ba8c2f9e
parent00b127b134ff41ea14ec56fdd33c076e1ccffc1c
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
am: 00b127b134

* commit '00b127b134ff41ea14ec56fdd33c076e1ccffc1c':
  Bring escalation options UI closer to mock.

Change-Id: I4e97594c7ea9d5c70f0629fae2c0f894a3fbab08