| commit | d01ffd6d15d33bed2dffe701ff07b28b63da77bb | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Fri Nov 07 18:20:16 2014 +0000 |
| committer | Trevor Johns <trevorjohns@google.com> | Fri Nov 07 18:20:16 2014 +0000 |
| tree | ca0ff2e2aec1dbd5cc7336e40625a289510703e6 | |
| parent | e829bcc46bdde563f5d8d3dc5357be5a08e540f9 [diff] | |
| parent | d09cd7a3683f2f3af5e6fc7f3103b4df6be60fdc [diff] |
Resolve conflicts for merge of commit 'd09cd7a3' into lmp-dev Conflicts: wearable/wear/SynchronizedNotifications/Application/tests/AndroidManifest.xml Change-Id: Ie64b4ba2ea2c7f6e0b85293524be9c82d363d6e5