tree 75b47f29d9552d919a77489473e9fa50ac7c905f
parent 05a8a492d835883411e016defb711ebe0eec417e
parent 6ff975bc3c1fb2ac1e430167bf8bac0e66e54dd5
author Ian Pedowitz <ijpedowitz@google.com> 1479950496 -0800
committer Ian Pedowitz <ijpedowitz@google.com> 1479950526 -0800

resolve merge conflicts of 6ff975b to master

Test: None (comment only change)
Change-Id: Ib1d948eb7bf9a9638d1989da82a8a3c5c885b5c4