OSDN Git Service

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

Change-Id: I1bf3c3a36f365a64b2a50c6e4c0c46e9d44353c4


Trivial merge