tree ca5f5758ed63ef4ba1a8b36417e6b16db103ba3d
parent 64d3f78ee5d9dabf7df6106241dfae3334b34714
author Ken Wakasa <kwakasa@google.com> 1416262683 +0000
committer Ken Wakasa <kwakasa@google.com> 1416262683 +0000

Revert "Follow up to https://android-review.googlesource.com/114561"

This reverts commit 64d3f78ee5d9dabf7df6106241dfae3334b34714 per https://android-review.googlesource.com/114664

Change-Id: I2acab828d41e79847db72f8d2677c12173a323b6