Commits
Chris Craik authored and Android Git Automerger committed 17917a95f35M
am d3f9ffe2: Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev * commit 'd3f9ffe28d1599e40f8c9a7c0c32465324bb2828': Prevent transformed ops from merging in the first place
Showing diff tod3f9ffe28d1