OSDN Git Service

Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"
authorDan Sandler <dsandler@android.com>
Mon, 14 Apr 2014 17:54:21 +0000 (17:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 14 Apr 2014 17:54:22 +0000 (17:54 +0000)
commit352e108259bcb3305f034cfb042287d43a5e8f80
tree9335c30335ee0082a86bbdeb3fb5fdd75dfe24fc
parentdb8b130a19484cb6018667905e64d42ab793654f
parentf3e3140696ca775fe2f62868addb1eec2b1c18fa
Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"
core/res/res/values/symbols.xml
packages/Keyguard/AndroidManifest.xml
packages/SystemUI/res/values/styles.xml
services/core/java/com/android/server/wm/WindowManagerService.java