tree 9326978569d18b57aa1277f863a8377214fa6bf1
parent b096e588116bea15b1e0ad889cd69bbc78c4cb0f
parent 6d0cb1e8eb8ff2e0b4cc8d14823debbc37cb7c6e
author TreeHugger Robot <treehugger-gerrit@google.com> 1489738555 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1489738564 +0000

Merge "Fixed cancel() and commit():"