diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-11-17 04:08:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 04:08:27 -0800 |
| commit | d949edddc0c7497a8a45cece5464e041eae8625e (patch) | |
| tree | a15a95cec93ba3797d37b1bcd61e738d6f7943d5 /libs/rs | |
| parent | b076bfc5e33ba9d234c874e3546b452d8410b668 (diff) | |
| parent | 4dce941ecec71aa999cf777a43f05821793b6749 (diff) | |
| download | frameworks_base-d949edddc0c7497a8a45cece5464e041eae8625e.zip frameworks_base-d949edddc0c7497a8a45cece5464e041eae8625e.tar.gz frameworks_base-d949edddc0c7497a8a45cece5464e041eae8625e.tar.bz2 | |
am 4dce941e: am 816e68e2: No-op merge from ics-mr0
* commit '4dce941ecec71aa999cf777a43f05821793b6749':
Diffstat (limited to 'libs/rs')
0 files changed, 0 insertions, 0 deletions