tree 0e6463af1fb44419240706554dc8d26c26e66829
parent f7cf5d43aa13405f9d0dd54f6038f710a0423323
parent 7fe95529e638467b77372dcac0efe51529e3bde1
author Lorenzo Colitti <lorenzo@google.com> 1412248318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412248318 +0000

am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

* commit '7fe95529e638467b77372dcac0efe51529e3bde1':
  Revert the configKey generation algorithm to what it was in K.