tree fc677e03b53f555008fa209c720b426915a389c9
parent 5ae84d1467ed9c57f520f84460b437afb310f548
parent edf31faae75dd0ef4415bb9c480475eb02572642
author Brad Ebinger <breadley@google.com> 1476472217 +0000
committer android-build-merger <android-build-merger@google.com> 1476472217 +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

Change-Id: Idc524f1489578e50a7a01f6a975928c2ebe9a147