| commit | c091ba8dd085871a137600bdc82e3b902fb544f5 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Fri May 16 10:13:26 2014 -0700 |
| committer | Griff Hazen <griff@google.com> | Fri May 16 10:13:26 2014 -0700 |
| tree | 4fc1d8df8215ffa20c35e67eddf8b364c4ac0de3 | |
| parent | c40c0c9d9cbf57ca731570ece2c26e80a898e948 [diff] | |
| parent | de35b636dfe5523dd9170d863248948852cd9cdb [diff] |
resolved conflicts for merge of de35b636 to master Conflicts: core/java/android/app/Notification.java Change-Id: I39ace14c976431bd7f6f1f9d5e4174b0a100aab0