OSDN Git Service

Merge "Change ISap version from 1.0 to 1.1" am: 2b5146a990 am: a0eff56a4c am: 0e9d500...
authorSteven Moreland <smoreland@google.com>
Fri, 4 Aug 2017 19:58:07 +0000 (19:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Aug 2017 19:58:07 +0000 (19:58 +0000)
am: a00508d951  -s ours

Change-Id: Ifb1145c96c14d69aa7560fd5f958202a2ba52fbd


Trivial merge