tree 25e4b7b77813cc037f5528387de6fea115a715d2
parent 18d026d870b0f3bd5aad20e77e7000d77cac4d2c
parent c20b37c2ae382292285e8cce77005d59eea6cf47
author Brad Ebinger <breadley@google.com> 1476472613 +0000
committer android-build-merger <android-build-merger@google.com> 1476472613 +0000

Merge "Restrict SipProfiles to profiles directory DO NOT MERGE" into lmp-dev am: b85ded74dc  -s ours am: ef97df841f am: 130e997964  -s ours am: fc016f7775 am: 400ceba70e am: 87182fd52c am: 6f0c4163f5  -s ours am: e6c7099e82 am: 8865b320a4 am: 42c2d35477 am: edf31faae7
am: c20b37c2ae  -s ours

Change-Id: Ieba5b056c334809c44ac7bb8d8f281260cf2fe76