OSDN Git Service

Merge "Moves the encryption interstitial to use the list layout" into nyc-dev
authorUdam Saini <udam@google.com>
Mon, 22 Feb 2016 21:37:59 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Feb 2016 21:37:59 +0000 (21:37 +0000)
commit9b5898221082e72bd95dceb87311e8fdce437a51
tree04f01dd107cf0f942559717f9d13568b9228e9bb
parent4a24fb99e96d0be2c229368bd31c93532cb3b0b3
parent511107c09ba5daf5e674e278ea0d143360b5e449
Merge "Moves the encryption interstitial to use the list layout" into nyc-dev
am: 511107c09b

* commit '511107c09ba5daf5e674e278ea0d143360b5e449':
  Moves the encryption interstitial to use the list layout