OSDN Git Service

Merge "Fix security level display" into nyc-dev
authorTony Mantler <nicoya@google.com>
Mon, 8 Feb 2016 22:34:50 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Feb 2016 22:34:50 +0000 (22:34 +0000)
commit2eef414b1d585e0473853a36d1766250f5cb2194
treea0e4ed54ce9685bdc63211a1dc29c2f6b86b1f74
parent85657bc86c26dc9d6985e2bb4caa967037c521b1
parentb42b9045e25d24676ef9c3e0cb3b36f2c98d9a10
Merge "Fix security level display" into nyc-dev
am: b42b9045e2

* commit 'b42b9045e25d24676ef9c3e0cb3b36f2c98d9a10':
  Fix security level display