tree b88f7e98492ea25e24a79d8a980bbb97ab86171a
parent f2eb7c718def03f002a4356484566ed1c33aca16
parent c2e24c0a37ddeab930f731c062705d435e477f75
author Romain Guy <romainguy@android.com> 1243928181 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243928181 -0700

am c2e24c0a: Fixes #1876911

Merge commit 'c2e24c0a37ddeab930f731c062705d435e477f75'

* commit 'c2e24c0a37ddeab930f731c062705d435e477f75':
  Fixes #1876911