| commit | 6b24f367f8ed4ba9dcd406094478f79ea8e7f68a | [log] [tgz] |
|---|---|---|
| author | Maurice Lam <yukl@google.com> | Fri May 27 04:05:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 27 04:05:45 2016 +0000 |
| tree | ed08541bb0f02f72672815bcb336b909c88c18dc | |
| parent | 4422014febeaa68768e8256cfa6e3560e4a166da [diff] | |
| parent | 19c0046422e0cf5586e37323157a27331db45572 [diff] |
Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422 * commit '19c0046422e0cf5586e37323157a27331db45572': Add activity label to encryption interstitial Change-Id: I9bcda822435a42c9bf7d5486b7497fb6a8f30cf4