tree f120cc148e7b9c1f9125ee4c5a2aac5ea1f6d35a
parent 836990472e6068a757592dbcc39eaa5e4db8099d
parent f68832bcc1069c70ef27248da6d82e9f9056955a
author Romain Guy <romainguy@google.com> 1315858588 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315858588 -0700

Merge "Turn hinting back on"