OSDN Git Service

am 172d48cf: (-s ours) am 4d8134c1: Merge "Fix black keyguard / missing status bar...
authorAdrian Roos <roosa@google.com>
Thu, 27 Aug 2015 06:55:04 +0000 (06:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 06:55:04 +0000 (06:55 +0000)
* commit '172d48cf87e62aa378cd20766f452b2acdb197fa':


Trivial merge