tree f199051926accefcf290c1b51dec798c7ebd8bd2
parent bc69e3003853d6c31e4b57953af7a2e0bb294cc2
parent 65d720b3fb766f88c8f76bfba0538d0185cc6d21
author Lorenzo Colitti <lorenzo@google.com> 1412257692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412257692 +0000

am 65d720b3: am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

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