OSDN Git Service

Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am:...
authorMaurice Lam <yukl@google.com>
Fri, 13 May 2016 01:02:15 +0000 (01:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 01:02:15 +0000 (01:02 +0000)
commitc89dafa84e11d78131ec1251f457ef63fcb29428
treec37c745646f8efe14a1d3502f96aaff1954d872c
parenta63fa6f4b7cd3fc4b60742b7411c1f450d0a7840
parent1bc12ee9c25ea42c660d11244b8ff9a0c03ba3c0
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172
am: 1bc12ee9c2

* commit '1bc12ee9c25ea42c660d11244b8ff9a0c03ba3c0':
  [ScreenLock] Use requested quality for encryption popup

Change-Id: Ic93f54828b93bd167c73de8736b02345a45639e8