| commit | e758964d7b940ba8bd3a6a032f3e407624b74655 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Nov 16 18:18:36 2016 -0500 |
| committer | Alan Viverette <alanv@google.com> | Wed Nov 16 18:18:36 2016 -0500 |
| tree | 920bf14065e8a50201f1496ecbd1e6b19c6d2c9c | |
| parent | 9059af1df355df0bc1ccb1cb720925518c5a1de1 [diff] | |
| parent | af6b251c15dab2237fdf100b5ebb9c0851c2d490 [diff] |
resolve merge conflicts of af6b251 to master Test: ./gradlew assemble Change-Id: Ia446e8590bead2f5ffa3dd97e27c59885a5e4bbe