tree 1879b38a642c3b2a29dac1e22041ae956b8ae04f
parent 7cd43797ae41406792f70a5623bb6d207e575526
parent 5621f0d928dc738cb9bde78f1c23eaf916b8c931
author Android (Google) Code Review <android-gerrit@google.com> 1247263977 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247263977 -0700

Merge change 6820 into donut

* changes:
  Fixed NPE bugs in Uri. Fixes internal issue #1724719. Modified getQueryParameter() to use the encoded query string. Fixes internal issue #1749094.