| commit | a3f519fe6ffb6ac358a3a8015beb94ef1b596ae5 | [log] [tgz] |
|---|---|---|
| author | RoboErik <epastern@google.com> | Wed Mar 12 23:04:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 23:04:49 2014 +0000 |
| tree | 171b4e90092ad56c455426435332bdd07034cca8 | |
| parent | 0c28f11e223916452186bc00e73ef92cc1134aa2 [diff] | |
| parent | ffd353a73eb7794ef556c4e646f866b580a03abb [diff] |
am ffd353a7: (-s ours) am d9e113f0: b/12068020 add nonce to InputDeviceDescriptor. Do not merge * commit 'ffd353a73eb7794ef556c4e646f866b580a03abb': b/12068020 add nonce to InputDeviceDescriptor. Do not merge