| commit | e0cedc40a2c6671370fd0c434874e7e79c0ba71f | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Thu Apr 18 13:51:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 18 13:51:57 2013 -0700 |
| tree | 9e08ce5be6b9914f1d3d52835a3f9b6ee9028231 | |
| parent | 341a31b1072cda8b013cbadef6e75f9a771da326 [diff] | |
| parent | 17917a95f355634ba881cd3f587002cb7ef27ce6 [diff] |
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