OSDN Git Service

Merge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev
authorJeff Sharkey <jsharkey@google.com>
Thu, 14 Jul 2016 04:31:35 +0000 (04:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Jul 2016 04:31:36 +0000 (04:31 +0000)
1  2 
res/values/strings.xml

Simple merge