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