OSDN Git Service

Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422...
authorMaurice Lam <yukl@google.com>
Fri, 27 May 2016 00:32:35 +0000 (00:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 00:32:35 +0000 (00:32 +0000)
commit225d64cc5db926c65099eba090e4b09b61cac9e1
treede9c53cdbc5ae7748fbe69322339a3b5a287fc43
parent8d212eb8ba41b5fe30f916ab5a8e66d9d30d412e
parent934bb00ac317001db159bc28e12e4c43905a88c9
Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422 am: 2ddf85b94b
am: 934bb00ac3

* commit '934bb00ac317001db159bc28e12e4c43905a88c9':
  Add activity label to encryption interstitial

Change-Id: I7e2eaabb379bf878f88b12cee4c4909b5100499e