tree 95342ec0748ecab28e539fedc6cea6c6facb4a56
parent fb5408b66d02567bddc0ac2572e8dbbd0905ea2d
parent e50bc7bce9da58eb1b779d281b195fff53f308a8
author Eric Laurent <elaurent@google.com> 1499885698 -0700
committer Eric Laurent <elaurent@google.com> 1499886715 -0700

resolve merge conflicts of e50bc7b to master

Test: make
Change-Id: Iefdb803cbb451317a0a24fffd27d927702cc193c