tree 870ae89605e49658de3e5abca2797b68c5efbb26
parent 9c78316fe6baa4f7fd7d5108349ecf8a2532b047
author Svetoslav <svetoslavganov@google.com> 1448056811 -0800
committer Svetoslav <svetoslavganov@google.com> 1448056939 -0800

resolve merge conflicts of c10abb25f3 to cw-e-dev.

Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518