| commit | 6beee80b6c28488d5bfd6c9e3585dfb3d3b4ef80 | [log] [tgz] |
|---|---|---|
| author | Joe Baker-Malone <jbakermalone@google.com> | Thu Aug 27 21:35:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:06 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 3e950bd288e4249286f63f80c5ad9bcac34f226d [diff] | |
| parent | 7f4d43c3a63d9710cb53e53eee92fcf08aa18517 [diff] |
am 7f4d43c3: am e5a65448: (-s ours) am f5965cc5: am cb5af172: Merge "Device handling changes" into studio-1.4-dev automerge: bd3e68d automerge: a9c87d6 * commit '7f4d43c3a63d9710cb53e53eee92fcf08aa18517':