tree 71699c7e54d90a119df4039851804ffc096bf570
parent 200141ef1f44e1cbbce8c780e325de2b86f6bf71
parent 9fdcac7c30346ac7f8a0b14c6bfa83b0204a7883
author Torne (Richard Coles) <torne@google.com> 1446137226 +0000
committer android-build-merger <android-build-merger@google.com> 1446137226 +0000

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