tree c8ffa08f80bee9197067581b35a049d4164225f6
parent fbec4392800042b16d58d748bddbd0e4d7a62419
parent c4a805bf940c808a822c2de244f8becf43089c87
author Jean-Baptiste Queru <jbq@google.com> 1260976835 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1260976918 -0800

Merge from open-source master

Change-Id: I61c25b1a833960ec83f0f92b7bf775c767f00f45