| commit | 2993c30a333e46a830996b533317d95431140540 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Tue Sep 02 18:36:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 02 18:36:06 2014 +0000 |
| tree | e86130c54c8d57d2120b990cfd3f3a6e43d4db51 | |
| parent | b129930398e1be69d9e3d114386d80f0525706cf [diff] | |
| parent | 01fd39a09d1a0b451b56cdd897cf4db51441c41f [diff] |
am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev * commit 'ac0f5a4616dab78a4216d826219379a663cc1139': VirtualDisplay.Callbacks -> Callback