commit | 04cd19e9bfc3fe726cfca235958d4ed48bb904d4 | [log] [tgz] |
---|---|---|
author | Keisuke Kuroyanagi <ksk@google.com> | Tue Oct 14 11:38:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 11:38:11 2014 +0000 |
tree | 6c7b17e3d80d856469407bf077d08e0942337503 | |
parent | 97b986f670bbd00c7eded2462e52a02fe70c83b6 [diff] | |
parent | 1d0989b65cb0ee93a70dc479476025038aa720f5 [diff] |
am 1d0989b6: Merge "Quit using weightChildNode for ADDITIONAL_PROXIMITY and SUBSTITUTION." * commit '1d0989b65cb0ee93a70dc479476025038aa720f5': Quit using weightChildNode for ADDITIONAL_PROXIMITY and SUBSTITUTION.