diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-12 17:20:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 17:20:56 +0000 |
| commit | 9ccf502c80311ac9621645307e126341ffa80eb2 (patch) | |
| tree | 39eb241ee5ec27ed99c20a2c01be23864de772c3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6a3e6d13107c01c4a98eb7e333bad1348277498a (diff) | |
| parent | 832f0770c79369a76fe72ea210fb7a1fcbd958ff (diff) | |
am 832f0770: (-s ours) am cfefab71: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '832f0770c79369a76fe72ea210fb7a1fcbd958ff':
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