| commit | cd05a19c0775e69e93e4c93b0a48ab044b531d7a | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Wed May 21 12:12:27 2014 -0700 |
| committer | Griff Hazen <griff@google.com> | Wed May 21 12:12:27 2014 -0700 |
| tree | d15b2a09d948666b331b4036b42d1d1321cee198 | |
| parent | 708b75c6599afe1a215b07458e940fe3ca13622a [diff] | |
| parent | 39c179ab8ab439d98abac548bc4ffce486657f8d [diff] |
Merge commit '39c179ab' into manualmerge Conflicts: v4/Android.mk v4/api20/android/support/v4/app/NotificationCompatApi20.java v4/java/android/support/v4/app/NotificationCompat.java v4/kitkat/android/support/v4/app/NotificationCompatKitKat.java Change-Id: I1e647d427c6b789863a64e4f73099f52fec9f281