| commit | 728804894c767fa470639f5d98be2d68ebe33a09 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Tue Apr 26 13:15:04 2016 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Tue Apr 26 13:16:41 2016 -0700 |
| tree | 3368f319807839cd996ec751fb22617e30bffaec | |
| parent | f60722b1a99a89f964299a97fc06c2b1288e4bb3 [diff] | |
| parent | d6a72ad72a8d9b85717c4c3e2cdf625706fb4e43 [diff] |
Resolve merge conflicts of d6a72ad to nyc-dev Conflicts: wearable/wear/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties Change-Id: I80af76fd94a11fc8470d6fc4a6822ad0b455bf4b