| commit | d45000c1a9ea75421f5d56145097bbd25ef7d8ef | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Thu Apr 06 20:25:37 2017 -0700 |
| committer | Philip P. Moltmann <moltmann@google.com> | Thu Apr 06 20:25:45 2017 -0700 |
| tree | 7df8dfd7262acfa082f39f9c54a88104ab09fca4 | |
| parent | d17977dea340f7a38c7cd766a0fca9d77363d68d [diff] | |
| parent | 3c002e45dda1e594750abf63a2ed4a1e3816d36f [diff] |
resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp Test: Trivial resolution Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5