diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-01 10:51:22 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-01 10:51:22 -0700 |
| commit | 13ec406381335b7b73ac989c296baac31a64df81 (patch) | |
| tree | 1199af93e76ebc6179a23ad97c8adf3393c6f75b /include/ui | |
| parent | 827107f4ec7d9a53d7bb6e4071858252f263fa8c (diff) | |
| download | frameworks_base-13ec406381335b7b73ac989c296baac31a64df81.zip frameworks_base-13ec406381335b7b73ac989c296baac31a64df81.tar.gz frameworks_base-13ec406381335b7b73ac989c296baac31a64df81.tar.bz2 | |
Fix a bad merge.
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread
after the bad merge was reverted by master change 104487
(Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4).
bug:4157610
Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
Diffstat (limited to 'include/ui')
0 files changed, 0 insertions, 0 deletions