tree 265b328a6dceae83a5a4ffe8f06c6e1949ad3041
parent 70e1eb86fd3ec1ef3a3f4c2f4c951368ecdb89ae
parent 6245bd9e19639ec3f64cae4268b204f8bfa0c6c9
author Lorenzo Colitti <lorenzo@google.com> 1412257224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412257224 +0000

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

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