| commit | 708b75c6599afe1a215b07458e940fe3ca13622a | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Wed May 21 10:23:13 2014 -0700 |
| committer | Griff Hazen <griff@google.com> | Wed May 21 10:23:13 2014 -0700 |
| tree | 719d9e21a3ae2ad821201637676bf527140a9c0f | |
| parent | 83b8526436ba2e564dff99ec4c6cf46fabfdf22e [diff] | |
| parent | e20403d12eba72f5b5a09edc798181109c6a3c89 [diff] |
Merge commit 'e20403d1' into master Conflicts: v4/java/android/support/v4/app/NotificationCompat.java v4/kitkat/android/support/v4/app/NotificationCompatKitKat.java Change-Id: I0435ac0ae16d62f6d602bf11b3f94e6080c57f87