| commit | 98baf32be14ae9e08e48cf400f6a18dd4c236378 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Sat Oct 18 16:37:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 18 16:37:29 2014 +0000 |
| tree | b198bb1ce4d80720c525a83a4fe5d6db7ee1e502 | |
| parent | a8955e768a54cc7787c2712b0a830de30d5fad5f [diff] | |
| parent | 451d68d50ef7ceac4c96fb66333dff54e5cd34f2 [diff] |
am 451d68d5: am 250678ad: am cb20616a: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop * commit '451d68d50ef7ceac4c96fb66333dff54e5cd34f2': When ensuring screen exists, make sure it's actually referring to a screen, not a rank