| commit | 19c0046422e0cf5586e37323157a27331db45572 | [log] [tgz] |
|---|---|---|
| author | Maurice Lam <yukl@google.com> | Thu May 26 23:46:06 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 26 23:46:07 2016 +0000 |
| tree | 3f32b9740c173ac35a70c79e4814891aaca4deb5 | |
| parent | d5f7c20a268b7c0ebe52bc10f6887b8ad91830f5 [diff] | |
| parent | 46a194bf3bbd41e57e786c8a3e5e7e00ea8df58a [diff] |
Merge "Add activity label to encryption interstitial" into nyc-dev