tree b855bbbbbc3a6cbd02d9373ff4f6d1b1ce96bcfb
parent bb34be303e4c4f73eb108c5f7f1f20d3516576a4
parent e69d27b16bda62d686628e217ecaeca385efe468
author Brad Ebinger <breadley@google.com> 1476467468 +0000
committer android-build-merger <android-build-merger@google.com> 1476467468 +0000

Merge "Restrict SipProfiles to profiles directory" into nyc-dev am: 51747dda47
am: e69d27b16b

Change-Id: Ie6f332494af3a2207b77ac10ba94f1d8a147f8ac