| commit | 654a88d32cc6b1da222e07ea0f0c5e431fbfab20 | [log] [tgz] |
|---|---|---|
| author | Alex Hills <ahills@google.com> | Tue Jan 24 11:18:19 2017 -0500 |
| committer | Alex Hills <ahills@google.com> | Tue Jan 24 11:19:57 2017 -0500 |
| tree | 1c370d135cf4f390cd7144e59a6adc7c8e196570 | |
| parent | cda5febca0f9d4925a6572b15214798fab0b3fa3 [diff] | |
| parent | 3608e08ad83cab2172862e722e8735f00b77d81a [diff] |
resolve merge conflicts of 3608e08ad8 to master Bug:34360598 Test: Wrote tests (that fail before this CL and now pass), and ran ./gradlew support-compat:connectedCheck --info --daemon -Pandroid.testInstrumentationRunnerArguments.class=android.support.v4.app.NotificationCompatTest Change-Id: I1507a050b25843d3028a28857505f732c3466f9a