commit | 66e798a1daedc940fccb685a5fcae7e9b239b46f | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 09 12:32:03 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:32:03 2013 -0700 |
tree | 2819d0df63ebb34bd29d50d1fb81fc77d9581d47 | |
parent | 0fa52410e6c751faf86e990958c1589ba7b7465b [diff] | |
parent | e62721e9826e0b2ae45ab500cf747501e21c16bd [diff] |
am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '4cdee7a61b140cf1a38b3d1eb1ac596525aa609b':