diff options
| author | Elliott Hughes <enh@google.com> | 2016-10-05 16:27:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-05 16:27:07 +0000 |
| commit | ee18e8ae76b0828006d07262ed6085dca9fd08c1 (patch) | |
| tree | e040b9784cd40c0f07f3eee3412189d02216faee /resource.c | |
| parent | 36b1864b8bc3e975859f28b0ea3a6f64434eeda6 (diff) | |
| parent | 73ecfe917d685f2838e64fe47432bfaffb60b170 (diff) | |
| download | strace-ee18e8ae76b0828006d07262ed6085dca9fd08c1.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge" am: ecaf114d8d am: f6bf43d4d4android-n-mr2-preview-1
am: 73ecfe917d
Change-Id: I3f1609c71510a98ce1114dfbfa3a246908c3cfa4
Diffstat (limited to 'resource.c')
0 files changed, 0 insertions, 0 deletions