diff options
| author | Scott Main <smain@google.com> | 2010-10-25 17:56:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-25 17:56:40 -0700 |
| commit | cd44bf9c7ae89edcf906451e162d096cf3d7e561 (patch) | |
| tree | 54bd70df5d8c6849b4340e3325895992f9905340 /libs/rs/rs.spec | |
| parent | 068ee16b57c54830ca78fab4066b39ca36c163e9 (diff) | |
| parent | 024127c11f4431eb701f457789374081a7f6fca4 (diff) | |
| download | frameworks_base-cd44bf9c7ae89edcf906451e162d096cf3d7e561.zip frameworks_base-cd44bf9c7ae89edcf906451e162d096cf3d7e561.tar.gz frameworks_base-cd44bf9c7ae89edcf906451e162d096cf3d7e561.tar.bz2 | |
Merge "resolved conflicts for merge of f0b3fa60 to master"
Diffstat (limited to 'libs/rs/rs.spec')
0 files changed, 0 insertions, 0 deletions