diff options
| author | Eric Laurent <elaurent@google.com> | 2011-11-05 08:52:20 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2011-11-05 08:52:20 -0700 |
| commit | f5a486a54d85ee59f4e9afa18b05c1946d749050 (patch) | |
| tree | 3e2b736f57ec861e490f34d76119d2f024e30cc5 /services | |
| parent | 7040b12bb2f83209bbccd0149d365e2d106adc74 (diff) | |
| parent | 047f160561fc7a87fc5794762d36225bfa5d2e89 (diff) | |
| download | frameworks_av-f5a486a54d85ee59f4e9afa18b05c1946d749050.zip frameworks_av-f5a486a54d85ee59f4e9afa18b05c1946d749050.tar.gz frameworks_av-f5a486a54d85ee59f4e9afa18b05c1946d749050.tar.bz2 | |
resolved conflicts for merge of 79178b8b to master
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions