tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 3b1a07bcfef0ed6d65aa56629b51a3818a78dbd5
author Ben Gilad <gilad@google.com> 1380585729 -0700
committer Ben Gilad <gilad@google.com> 1380587009 -0700

Roll forward of https://googleplex-android-review.git.corp.google.com/#/c/367504/ that was rolled back in https://googleplex-android-review.git.corp.google.com/#/c/367698/ and should be safe to resubmit once https://googleplex-android-review.git.corp.google.com/#/c/367945 and the test-fix CL (https://googleplex-android-review.git.corp.google.com/#/c/367771/) are submitted -- see b/10976383 for details.

Change-Id: I364488cd6007aa8c13b056e7e9aff0b4c22765bb