tree 5c4403c17f5731dc1d449ae4b4ec4f47b834985d
parent 6a2c77856f1cfa402363cfbb04b5718b431bbc6e
author Adam Cohen <adamcohen@google.com> 1409786873 +0200
committer Adam Cohen <adamcohen@google.com> 1409786966 +0200

Potential fix for a couple bugs

issue 17371274
issue 17368590

Change-Id: I717f9c37613efd9d61e401540ca82aff77058022