tree e910de4c67acc259bc14cd479a0fc1fa7468cb80
parent 7f8ba8eace1379fe45bad3adb91925be236c041d
parent b09530734220ef8b19f8bfbe66659e92b0ddc795
author Jean-Baptiste Queru <jbq@google.com> 1344619029 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1344619032 -0700

Import upstream master

Change-Id: I678e1ff829ee3a05091c1487c90f29734dd93077