diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-11-11 16:08:29 -0800 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-11-11 16:08:29 -0800 |
| commit | 741625a17e80bc0ad8e728ba73536386efb1fb4d (patch) | |
| tree | 0b9740e3cfcd40930950d6e3d07ba81b9dd07b28 /services | |
| parent | 32dc54a1c9a717ee5a7ebdf417bfeafa115c9c59 (diff) | |
| parent | 37878b1e57ee25629f0d9aff5edf599afcc8c6eb (diff) | |
| download | frameworks_native-741625a17e80bc0ad8e728ba73536386efb1fb4d.zip frameworks_native-741625a17e80bc0ad8e728ba73536386efb1fb4d.tar.gz frameworks_native-741625a17e80bc0ad8e728ba73536386efb1fb4d.tar.bz2 | |
resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp
Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions