commit | f938d1f401b77e348b6293d57917172b11bb41b9 | [log] [tgz] |
---|---|---|
author | Dake Gu <dake@google.com> | Fri Dec 05 23:49:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 23:49:18 2014 +0000 |
tree | 2c1a61df09d4b0869a73df12d4b08665b2b9c459 | |
parent | d0ea9c5fb3cff557ff692dbb085ded722ba0b453 [diff] | |
parent | 10d5cf7067aaba76bbbdc62f132e1a5ce295c0ee [diff] |
am 10d5cf70: (-s ours) am 7c72d5e9: (-s ours) Merge "Import translations. DO NOT MERGE. Fix crash of using RowsFragment in layout xml" into lmp-dev * commit '10d5cf7067aaba76bbbdc62f132e1a5ce295c0ee': Import translations. DO NOT MERGE. Fix crash of using RowsFragment in layout xml