| commit | e3c7d23c84143e3d148c23f9cdb8e42aa3ac09af | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Wed May 10 01:19:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 10 01:19:30 2017 +0000 |
| tree | df4caed141cb213cf7fd0574033e1387e3ef7e38 | |
| parent | 971b5761ca1f2549564a5478ea557e484db7c6aa [diff] | |
| parent | 1cb999f6c9a0b7f65199db6bcef6aec569d35573 [diff] |
Merge "Merge "NsdService: more cleanups" am: 903d64634a am: 49bc06d0f9" into nyc-mr2-dev-plus-aosp am: 1cb999f6c9 Change-Id: If67a0c418e92879b7f8f0186e3e4ea437a7a6e1f