diff options
| author | Colin Cross <ccross@android.com> | 2013-06-17 18:19:28 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-06-17 18:19:28 -0700 |
| commit | 99c1a4168ba792437f298d31cd4631ff01661476 (patch) | |
| tree | 32946bf44bf4ffc8eb656e1f60ab163923495844 /logwrapper/logwrap.c | |
| parent | 520f4f060325496741f600692f3582536fa43a8f (diff) | |
| parent | 95a41f6b20c678c5f475558ac00ab449ffd1f481 (diff) | |
| download | system_core-99c1a4168ba792437f298d31cd4631ff01661476.zip system_core-99c1a4168ba792437f298d31cd4631ff01661476.tar.gz system_core-99c1a4168ba792437f298d31cd4631ff01661476.tar.bz2 | |
resolved conflicts for merge of 95a41f6b to stage-aosp-master
Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9
Diffstat (limited to 'logwrapper/logwrap.c')
0 files changed, 0 insertions, 0 deletions