| commit | 13ec406381335b7b73ac989c296baac31a64df81 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Apr 01 10:51:22 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Fri Apr 01 10:51:22 2011 -0700 |
| tree | 1199af93e76ebc6179a23ad97c8adf3393c6f75b | |
| parent | 827107f4ec7d9a53d7bb6e4071858252f263fa8c [diff] |
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