OSDN Git Service

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

Change-Id: I1083eb3cf8c1ca59fb706fb86ae62561637b0bfe


Trivial merge