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)
commita00508d9510a8b9f59f5cb02042e0020ed68e7c4
tree73f3710868370ec815f51220caec0d4ca82abc8b
parent3cf97d2bef8089f86c6f5315c1a63f0a68143c50
parent0e9d50083891a1155643fe40ab1135045a24b4da
Merge "Change ISap version from 1.0 to 1.1" am: 2b5146a990 am: a0eff56a4c
am: 0e9d500838  -s ours

Change-Id: I1083eb3cf8c1ca59fb706fb86ae62561637b0bfe