diff options
| author | Elliott Hughes <enh@google.com> | 2012-08-16 14:23:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-16 14:23:54 -0700 |
| commit | 4e75c3a3dc62f65162cafc43e6af98d3229defbe (patch) | |
| tree | 3cc61eccab12fb4fc23daeddcf4d8d4ab51a5598 /annotations/generate_annotated_java_files.py | |
| parent | b55c8aa5ed7c02b5a6dc17d12218122db25e36ee (diff) | |
| parent | 2b3b3baa656c7edf6856ecd2bd0aa00b0addd0d6 (diff) | |
am 2b3b3baa: am 9f1e518b: Merge "Fix test flakiness by not assuming we\'re in en_US."
* commit '2b3b3baa656c7edf6856ecd2bd0aa00b0addd0d6':
Fix test flakiness by not assuming we're in en_US.
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions