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