| commit | d8e0e22b55109a69164a6c83e1f5722c5682f81f | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Fri Nov 21 13:59:09 2014 -0800 |
| committer | Griff Hazen <griff@google.com> | Fri Nov 21 13:59:09 2014 -0800 |
| tree | b55f5f63aad7e01112f3b0f6357b3bdbdabbed80 | |
| parent | c9ff33063d90cdfc0fddcf7a695a04a16709d631 [diff] | |
| parent | 29cf9f7e3fbb2fb90d706bdca1bdcdb2754be544 [diff] |
Merge commit '29cf9f7e' into lmp-mr1-dev Conflicts: v4/java/android/support/v4/app/NotificationCompat.java Change-Id: Ic0981c28b9072247170f3e39a08e2e4d274d09db