tree 4c1e9d2a96f36893e0ae98947348bef8bdc912b9
parent 4579d5c5cb76613124f76049bf8fba7405a75b09
parent 6f127a614c6a3e64a5de963f3a11d68d3368cd84
author Adam Cohen <adamcohen@google.com> 1402621616 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402621616 +0000

am 6f127a61: More defense for issue 14491953

* commit '6f127a614c6a3e64a5de963f3a11d68d3368cd84':
  More defense for issue 14491953