am d28e24dd: am e0f77d75: Roll forward of https://googleplex-android-review.git.corp...
Ben Gilad [Wed, 2 Oct 2013 16:44:59 +0000 (09:44 -0700)]
* commit 'd28e24dde0d8cbede703daa6957cba76b05cf089':
  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.


Trivial merge