diff options
| author | Justin Ho <justinho@google.com> | 2010-10-10 11:25:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 11:25:41 -0700 |
| commit | 22b379ad178fe256bbfe706e32f611466f656fd9 (patch) | |
| tree | 7f53400edf2d4a22aaafaa985298573c0b76d8f8 /tools/localize/ValuesFile.cpp | |
| parent | 707fb0e0e56997a33ae59ffc001344602f3b7b14 (diff) | |
| parent | 51501aa8703c15c6156ba14774f3ff41cde31700 (diff) | |
| download | frameworks_base-22b379ad178fe256bbfe706e32f611466f656fd9.zip frameworks_base-22b379ad178fe256bbfe706e32f611466f656fd9.tar.gz frameworks_base-22b379ad178fe256bbfe706e32f611466f656fd9.tar.bz2 | |
am 51501aa8: (-s ours) am b74941e3: Merge "Fixed popup assets (background)" into gingerbread
Merge commit '51501aa8703c15c6156ba14774f3ff41cde31700'
* commit '51501aa8703c15c6156ba14774f3ff41cde31700':
Fixed popup assets (background)
Diffstat (limited to 'tools/localize/ValuesFile.cpp')
0 files changed, 0 insertions, 0 deletions