tree 311be00c8f63281dd40a178d498a8362213c815f
parent ca2a6374aadb95ca3f151d4bc2fdd3127f04e5e7
parent f0d4777473f25847d67fc17fc082fada08cf678d
author Jeff Tinker <jtinker@google.com> 1366403555 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366403555 +0000

Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev