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:30:00 +0000 (00:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 00:30:00 +0000 (00:30 +0000)
commit934bb00ac317001db159bc28e12e4c43905a88c9
treeeebe0673460500eb8d8a7a2fbf06e588f63f58de
parent202f94bb11d646879b5cf630144264d3f7d0aaa3
parent2ddf85b94b696730189dfda4e680d25a47874eb8
Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422
am: 2ddf85b94b

* commit '2ddf85b94b696730189dfda4e680d25a47874eb8':
  Add activity label to encryption interstitial

Change-Id: I3922ed6182b5b3b34e0a031af872c5e1a7069143
AndroidManifest.xml