tree 19c9624e6e4cda73a4491a7795f5d6da68abf944
parent 088a997defe5ac88d10c341af277bceb7c46f479
parent 515d25e79991db17c56244e7b7654f7e8bcbf3c9
author RoboErik <epastern@google.com> 1394665484 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394665484 +0000

am 515d25e7: (-s ours) am 840af707: am c1e0015e: b/12068020 Add a way to add uniqueness to device descriptors. Do not merge

* commit '515d25e79991db17c56244e7b7654f7e8bcbf3c9':
  b/12068020 Add a way to add uniqueness to device descriptors. Do not merge