OSDN Git Service

Merge "[AWARE]: Enable SDEA based SSI" am: 83b034ea0f
authorEtan Cohen <etancohen@google.com>
Tue, 21 Feb 2017 22:52:05 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 22:52:05 +0000 (22:52 +0000)
am: f9758f839e

Change-Id: Iaf1b625203e8f8844a9a420417322b11709b5428


Trivial merge