tree ee48f017fca2899cca7e5a8711fad8386e12f624
parent bb60ee97664667c7774aa3c45b473332a3757d21
parent 6b67215235d6c419f22fb1cfc6768d35147c9607
author Narayan Kamath <narayan@google.com> 1323260143 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323260143 -0800

Merge "Allow data uris to be data sources"