| commit | 1db07fc8a1bb2b2bfc5e1fcf7cf95457c7371de0 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Oct 29 16:47:26 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 29 16:47:26 2015 +0000 |
| tree | 71699c7e54d90a119df4039851804ffc096bf570 | |
| parent | 94686e19f3915f63056d1380d5f4019eaf585f6a [diff] | |
| parent | 286fb39a13c395a713552b0e53c7b2e57429e7d7 [diff] |
am 656ec984: (-s ours) resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aosp am: 286fb39a13 * commit '286fb39a13c395a713552b0e53c7b2e57429e7d7': Track move of android.net.http.ErrorStrings.