tree d4d6b88697b1f59f8df13ac81296f44527165c3a
parent 68d3077e9a11c96d118834563fa283b3ead4f1a7
parent bc13415ef4797f998e5f95bde81ff7b2403f8496
author Android Build Merger (Role) <android-build-merger@google.com> 1463767383 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463767384 +0000

Merge "Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 214ebfb532" into nyc-mr1-dev-plus-aosp