tree 6ebf1a68c97f28a7531ee43edfed42bb8763fdcf
parent c127d656b50b6dfd20548abde175840947b639f6
author Mark Salyzyn <salyzyn@google.com> 1450818159 -0800
committer Mark Salyzyn <salyzyn@google.com> 1451330424 -0800

resolve merge conflicts of 94ab88228e to master.

Bug: 26178938
Change-Id: I1ec3421f4bb501942a0c06032d56cdaf06f56b45