tree 09438d9aaac726b25c9802c3886da25d7a914b83
parent 9bf106f1569faf647b5d3cf4dbc0b60e0921c831
parent ed1ce37759fe1312d590e7ed46f1eb65a8a38ac2
author Leon Scroggins III <scroggo@google.com> 1422627146 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1422627147 +0000

Merge "AvoidXferMode -> AvoidXfermode."