| commit | bb91aba1984efb6de49474b72c8d860bbb80efce | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Thu Aug 17 01:43:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 17 01:43:37 2017 +0000 |
| tree | 394b5a769c9df08b6e56730bd8b1cae99c206ea2 | |
| parent | b87bf931bb6eb0db39f6f8a98d76dc8baca11a1a [diff] | |
| parent | 0154ccd549d53b282c8d77ddc4efa1017dad9600 [diff] |
Merge "Support both Clear key plugin UUIDs." into oc-mr1-dev am: 420b2094a3 am: 0154ccd549 Change-Id: I765bc39c4b65290ab95ab138e96d4b4ddc2fc292