| commit | 9fdcac7c30346ac7f8a0b14c6bfa83b0204a7883 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Sun Apr 26 22:07:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 26 22:07:29 2015 +0000 |
| tree | ceecfce4cb7d8ae7dd058ccbd4493b3d5e54c4ce | |
| parent | c92f7b205db77b5096c140d72112022316cf3bd9 [diff] | |
| parent | 9ca4f33e3a20e100af0390af4035382f7caa47eb [diff] |
am 9ca4f33e: (-s ours) am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master * commit '9ca4f33e3a20e100af0390af4035382f7caa47eb': Remove the default text encoding resource. Wrap one more Context