diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-12 17:15:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 17:15:48 +0000 |
| commit | 832f0770c79369a76fe72ea210fb7a1fcbd958ff (patch) | |
| tree | 137523df05eca840ce7ca9d1096ede90cfa3bedf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b3f447e9ca9fd3ed62dec3bdcc049de330f5e053 (diff) | |
| parent | cfefab71b1db5500fa3c294a816a3ccb0990242c (diff) | |
am cfefab71: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'cfefab71b1db5500fa3c294a816a3ccb0990242c':
Import translations. DO NOT MERGE
Fixed constant window switching on lock screen with Swype KB.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions