tree b0d149c0c39f01d8b2e5125db3499f2617d10203
parent 6d7810611025ead565f53ec8eb40fe7c78582172
parent 5006d4093ad1455ee98c157a71f57e9ea42b4dae
author Chris Wren <cwren@android.com> 1350419503 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350419504 -0700

Merge "Better handling for network lag and large images." into jb-mr1-dev