diff options
| author | Elliott Hughes <enh@google.com> | 2012-07-31 09:47:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-31 09:47:31 -0700 |
| commit | 6a2cbb22c2ac526c71a80bc0ec54e6dac2e22bf6 (patch) | |
| tree | 90927ea68c81d3aa554fe225f570cb8a5347fc11 /annotations/generate_annotated_java_files.py | |
| parent | 95ca54d1ae12653915882f3a3bf16746c676883b (diff) | |
| parent | 48b00f0d52cdce981c197e67e46a61af31d8648f (diff) | |
am 48b00f0d: Merge "HttpResponseCache should return 504, not 502."
* commit '48b00f0d52cdce981c197e67e46a61af31d8648f':
HttpResponseCache should return 504, not 502.
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions