tree 51929151d40b820e8d8cd543112497acb20934f9
parent 7ee6163b6a1a2cd0565f59b87c4b121df205443d
author Brian Muramatsu <btmura@google.com> 1280266021 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1280267963 -0700

manual cherry-pick of 45f8e6a523a096a3781f90d4fd5d54dcc0673a7e

Change-Id: I770948540f3aca9d930edea7a12119ff63fe9bdf