| commit | 01fd39a09d1a0b451b56cdd897cf4db51441c41f | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Tue Sep 02 18:21:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 02 18:21:50 2014 +0000 |
| tree | a8a23f76d907f9cda88e5b6150f77e135ee14993 | |
| parent | 8adc5b68add9af323d48c6ea992d70ab58431df5 [diff] | |
| parent | ac023ddb4542f0c6301e6fb7ab0a21bbd4636136 [diff] |
am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev * commit '6e0bd93a2b7fc338c3ba64995cba309cd51035b6': VirtualDisplay.Callbacks -> Callback