OSDN Git Service

Merge "Fix security level display" into nyc-dev am: b42b9045e2
authorTony Mantler <nicoya@google.com>
Mon, 8 Feb 2016 22:43:26 +0000 (22:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Feb 2016 22:43:26 +0000 (22:43 +0000)
commite6bf75512573b71cad57eb893bc94a06d7de78d4
treec167ac9a4d0e573dd273b487407da67ae59d6d91
parentc8bd4a8e617664da81c0b03eaf906bd4813edda7
parent2eef414b1d585e0473853a36d1766250f5cb2194
Merge "Fix security level display" into nyc-dev am: b42b9045e2
am: 2eef414b1d

* commit '2eef414b1d585e0473853a36d1766250f5cb2194':
  Fix security level display