OSDN Git Service

am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue...
authorDianne Hackborn <hackbod@google.com>
Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)
commitca9433519b410a531c84161fbc27262fc57f0106
tree2e50ea855ce47b10bac62d38b186e0b528a0bca8
parent4b0e84d667df8e524a989221cc3cc8a583cbef72
parenta0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f
am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit 'a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
  Fix issue #23116383: Include security patch level in Settings
res/values/strings.xml
src/com/android/settings/DeviceInfoSettings.java