| commit | 87f0897426e3f428c6ebd5793787a9b4855a3a56 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed May 03 01:50:35 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 03 01:50:37 2017 +0000 |
| tree | 3794e0f486828c554f58d4e3c3ca8f901ca8384c | |
| parent | 58a16346168dac19cb5e231d9eb442f6cb38530d [diff] | |
| parent | 0bdcf66bf30dfe60b44ea2d69bc846cca33fc3f3 [diff] |
Merge changes I155f9f77,Ibb1aa07a,If460a6ef,Ifabff1c2 * changes: Fix trivial warnings hidden by -isystem Fix non-trivial warnings hidden by -isystem Rename SurfaceMediaSource::dump to dumpState HACK: work around both android-base/logging.h and ADebug.h defining CHECK