| commit | a5dc90acdb57214fee0e5f322d8afb98b311b0e2 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Thu Oct 29 16:47:06 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 29 16:47:06 2015 +0000 |
| tree | 71699c7e54d90a119df4039851804ffc096bf570 | |
| parent | 200141ef1f44e1cbbce8c780e325de2b86f6bf71 [diff] | |
| parent | 9fdcac7c30346ac7f8a0b14c6bfa83b0204a7883 [diff] |
am 9ca4f33e: (-s ours) am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master am: 9fdcac7c30 * commit '9fdcac7c30346ac7f8a0b14c6bfa83b0204a7883': Remove the default text encoding resource. Wrap one more Context