| commit | 8403ef80afb258ce8e476a1f9fc011af23deeb6e | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Fri Apr 25 01:52:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 25 01:52:15 2014 +0000 |
| tree | 83c2cbd6c753620275f225e133bd22cfd67b905a | |
| parent | cdf554516807ac5fe97653a2f2760fdd7f633a54 [diff] | |
| parent | 45230b12405211f81ae8bd3ac5d6fced9c3d3d2a [diff] |
am 45230b12: am bc9c554a: resolved conflicts for merge of 7761fdd6 to klp-modular-dev * commit '45230b12405211f81ae8bd3ac5d6fced9c3d3d2a': DO NOT MERGE Backport recent NotificationCompat changes.