OSDN Git Service

Merge "Fix inconsistent use of screenlock" into nyc-dev
authorKenny Guy <kennyguy@google.com>
Wed, 17 Feb 2016 21:51:53 +0000 (21:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Feb 2016 21:51:53 +0000 (21:51 +0000)
commit451ff8e916b7a1ff9208bbf7f9330b9db633eac5
treec40424501a3c78bcb5e521c38864602cfbe54e10
parent6e7cfdda7975a737268f8a7281da5186d3ad2201
parent9de8c4625a517af011f8c68a270c463c99d34f7e
Merge "Fix inconsistent use of screenlock" into nyc-dev
res/values/strings.xml