| commit | cdabfe48c300f15466c9472375d7ad2ccf9ba328 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Apr 24 09:28:13 2013 -0700 |
| committer | Andreas Huber <andih@google.com> | Wed Apr 24 09:28:13 2013 -0700 |
| tree | f99296fb28eba318b7d6a01989e47884abc97239 | |
| parent | 4e6139a522ee0fae9acad3e48d2b4158127a3bfa [diff] | |
| parent | e55951df62a777485f437bf070a5149caf62955f [diff] |
resolved conflicts for merge of e55951df to master Conflicts: media/libstagefright/wifi-display/Android.mk Change-Id: Icdf5e745a859506cbed7be93b6bc5def8046473c