tree fc677e03b53f555008fa209c720b426915a389c9
parent 3ac0a9b1e6ef1dc2af1beaaef18f07af0feaf970
parent d0b19d541eb5fdc059653e575031908efe0fefc5
author Brad Ebinger <breadley@google.com> 1476467924 +0000
committer android-build-merger <android-build-merger@google.com> 1476467924 +0000

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

Change-Id: I88cc18d9f6519a2aacc2ecc9618009cb24b4ae85