tree df97d1dbb309485d0c9bfa1360b80b7bcef9b8c5
parent b8232aeb776153af29a925e6a7ec1ce27bd69af9
parent 97cb82a7402931e6cd2d682f8bc903ef51114735
author Android (Google) Code Review <android-gerrit@google.com> 1247258402 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247258402 -0700

Merge change 6801 into donut

* changes:
  Uri.EMPTY.toString() was returning null due to an initialization order bug. Fixes internal issue #1957015.