| commit | 0154ccd549d53b282c8d77ddc4efa1017dad9600 | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Wed Aug 16 23:01:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 16 23:01:21 2017 +0000 |
| tree | 9b9f666580475686bb5c1403b0fb7cb805e51f99 | |
| parent | 3fa1d041b79e7fc1550bc1c12947da43b37cbdda [diff] | |
| parent | 420b2094a3091ba18e63ba50b287ee813b6c2188 [diff] |
Merge "Support both Clear key plugin UUIDs." into oc-mr1-dev am: 420b2094a3 Change-Id: Icb8589075c06aded530ee0e8c6ca7fb65e3551b8