am 2ca027c8: Allow trailing newline in trie files. automerge: 99df2e4
authorJarkko Pöyry <jpoyry@google.com>
Tue, 11 Nov 2014 18:39:20 +0000 (18:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Nov 2014 18:39:20 +0000 (18:39 +0000)
* commit '2ca027c89134c1c41cfc6351be75cadb8d22a535':
  Allow trailing newline in trie files.


Trivial merge