OSDN Git Service

Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev...
authorPaul Crowley <paulcrowley@google.com>
Wed, 5 Nov 2014 18:05:05 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Nov 2014 18:05:05 +0000 (18:05 +0000)
commit1e4d6e64a43a1eb5de893a71178c64d240d01f9f
treea35e002149f98c0b2aeb1431cc53ea684fc3495b
parent7ce01fe3529c4095301dc49836953a00f604eeed
parent966a1cadbf83412384261d1eea1192150e5fd1a8
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge: e6ad7bf
automerge: 966a1ca

* commit '966a1cadbf83412384261d1eea1192150e5fd1a8':
  Don't show a pattern-specific prompt at encryption time.