| commit | e829bcc46bdde563f5d8d3dc5357be5a08e540f9 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Fri Nov 07 17:46:13 2014 +0000 |
| committer | Trevor Johns <trevorjohns@google.com> | Fri Nov 07 17:46:13 2014 +0000 |
| tree | 971daff4969ef5d3fe781424713175e3d4368a3b | |
| parent | 233036fd4f2f02d18726abc795cf7b676a8775fa [diff] | |
| parent | 5334cd2ae2d2fbb7c82c63ca18572c03ff5d822e [diff] |
Merge commit '5334cd2a' into manualmerge Conflicts: wearable/wear/EmbeddedApp/Application/src/main/AndroidManifest.xml Change-Id: Id40fbc565ab9670b5996e83279360a47c33a3d3d