tree d0c5c598f9bd75af69bb92eddb1e1902f60efc9e
parent e3bc42a71bef7f7474a6ab2f1864e84b258cfe9b
parent 76076c1cf835cd63ea12e4287128794d84ce5837
author Xin Li <delphij@google.com> 1450122041 -0800
committer Xin Li <delphij@google.com> 1450122041 -0800

Merge branch 'master' into brillo-m8-dev

BUG=26182029