tree 9b9f666580475686bb5c1403b0fb7cb805e51f99
parent 3fa1d041b79e7fc1550bc1c12947da43b37cbdda
parent 420b2094a3091ba18e63ba50b287ee813b6c2188
author Edwin Wong <edwinwong@google.com> 1502924481 +0000
committer android-build-merger <android-build-merger@google.com> 1502924481 +0000

Merge "Support both Clear key plugin UUIDs." into oc-mr1-dev
am: 420b2094a3

Change-Id: Icb8589075c06aded530ee0e8c6ca7fb65e3551b8