OSDN Git Service

Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into...
authorAdrian Roos <roosa@google.com>
Mon, 2 May 2016 15:29:23 +0000 (15:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 15:29:23 +0000 (15:29 +0000)
commit65731da3da4dd23de2d1ba5dd3f3606f89417223
tree71bd78ad9991f86af5fac6ae2fe694e8d64c51e7
parent0006559b697a17d0abc5b4c5006b0774169e520c
parent85a16e6ca9900c48dd3a6588230c418bc8b2cb9b
Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp
am: 85a16e6ca9

* commit '85a16e6ca9900c48dd3a6588230c418bc8b2cb9b':

Change-Id: I6795f46dd3496555efd3120d11c96a68f6e0dd29