commit | f288eab6b09d431f7760569fb055698bd2265cb5 | [log] [tgz] |
---|---|---|
author | RoboErik <epastern@google.com> | Wed Mar 12 23:04:44 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 23:04:44 2014 +0000 |
tree | 19c9624e6e4cda73a4491a7795f5d6da68abf944 | |
parent | 088a997defe5ac88d10c341af277bceb7c46f479 [diff] | |
parent | 515d25e79991db17c56244e7b7654f7e8bcbf3c9 [diff] |
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