diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-03-09 10:18:51 -0700 |
|---|---|---|
| committer | Wale Ogunwale <ogunwale@google.com> | 2015-03-09 10:37:04 -0700 |
| commit | 3c36b8e9569292b7da9a916b148a21dd6c273dc9 (patch) | |
| tree | 0f7be3f8a8f228d179e14a8574e62a2f6fa34474 /core/jni/android_media_RemoteDisplay.cpp | |
| parent | 93891686eb28f8c0da6545d277965e4db50d5065 (diff) | |
| parent | ca54b8765776cb1d1f5c2b87ca046ca64b9386ad (diff) | |
| download | frameworks_base-3c36b8e9569292b7da9a916b148a21dd6c273dc9.zip frameworks_base-3c36b8e9569292b7da9a916b148a21dd6c273dc9.tar.gz frameworks_base-3c36b8e9569292b7da9a916b148a21dd6c273dc9.tar.bz2 | |
resolved conflicts for merge of ca54b876 to master
Change-Id: I3148551b9809fb5c36007b26f26acf812b2f654d
Diffstat (limited to 'core/jni/android_media_RemoteDisplay.cpp')
0 files changed, 0 insertions, 0 deletions