tree a80600d42924f427300d44fd6461aae6abe0c720
parent 116e1e258eff0616b2a4f72f1323ef28399e2bfb
parent 0ad5f9ce6269b73e6bc8d0d5821ed7059f17b2ff
author Ben Chan <benchan@google.com> 1429221869 -0700
committer Ben Chan <benchan@google.com> 1429221869 -0700

Merge remote-tracking branch 'cros/upstream' into 'cros/master'