| commit | 7673c4dc884b45f82cfb70c123e7d2ffa126a2be | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Sep 22 09:15:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 22 09:15:21 2016 +0000 |
| tree | 8d1d48d001752a2fbcbdd6ebb5ae2b6b1f9b8037 | |
| parent | e84c07c8326742d9102aca544d4b1c68ec315bf3 [diff] | |
| parent | 06ec4b135230f6b3569c1032b913f99bfe3c0c54 [diff] |
Merge "Hide warning in cutils/trace.h" am: 5cf3db6d2b am: a802e570b3 am: 06ec4b1352 Change-Id: If41d5b551ffe237922f4768cf403cadf7ee15887