tree cf786ff2eb1b94568b72035b45bf65e0a986ffad
parent 1ef753d4caf4b1136de7b7da9e63d898be4a2e66
parent 8c70f9d05ac86551de20beb62ffefb5c3654584c
author Jean-Baptiste Queru <jbq@google.com> 1247619940 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1247619940 -0700

Merge commit 'goog/readonly-korg-master' into merge_korg_master

* commit 'goog/readonly-korg-master':
  Fix for a hang when attempting to stream a non-existing content.

Conflicts:
	res/values/strings.xml