| commit | 9ca4f33e3a20e100af0390af4035382f7caa47eb | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Wed Oct 29 19:34:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 19:34:33 2014 +0000 |
| tree | 1bc5ab5b7d835c4e3cdedcc6ae7c449012440d4d | |
| parent | 512dab0c0bc1590abc7032b262ccd33619eb0e9a [diff] | |
| parent | 3180c1cc68d4dd757705b0f1d89b97d5d3095536 [diff] |
am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master * commit '3180c1cc68d4dd757705b0f1d89b97d5d3095536': Remove the default text encoding resource. Wrap one more Context