| commit | 8f0c0adf9633189652d54c33361a18cba5073bf9 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Nov 12 19:27:46 2014 -0800 |
| committer | Trevor Johns <trevorjohns@google.com> | Wed Nov 12 19:27:46 2014 -0800 |
| tree | 5186cfc6baba2c863395331dd71fce6e72437a0d | |
| parent | 3f027ec1778a99c8bf333ab775809936e3a78bce [diff] | |
| parent | d7cb3c0adf75d2498aeed66754161cf6b817cc15 [diff] |
Resolve conflicts for merge of commit 'd7cb3c0a' into lmp-dev Conflicts: wearable/wear/JumpingJack/Application/src/main/AndroidManifest.xml Change-Id: Icea689e71640a4062bf964fad9adfdd1336b1844