tree ae9db3f8f8c38180ed853352a490619a5c74d759
parent c51e24699a26e39370c923351ec498ae7cc0b1aa
parent d1e3456b2e80b1c443ccd2764d240c1c46a1f7d0
author Jim Miller <jaggies@google.com> 1436399594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436399594 +0000

am d1e3456b: am 215763fb: am cd065639: am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev

* commit 'd1e3456b2e80b1c443ccd2764d240c1c46a1f7d0':
  Don't use fingerId when creating names