tree eede7a75db4946facbc91858e55f33659abc8cf6
parent 8b1086eb4b8c79a7bb92306d76c4e1a4ae512af9
parent 51747dda47e0b658a35ae55820ebaca7529e4c47
author Brad Ebinger <breadley@google.com> 1476467247 +0000
committer android-build-merger <android-build-merger@google.com> 1476467247 +0000

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

Change-Id: I9c44587dbdbe79647d0a9bdae3c10ca7cea66f42