tree 3c3763c910f2598589fb26e92dd530e909364aff
parent 9f80e6c2e36315fa58674b15a785843717f6d722
parent 130e997964ab8ddc1737a099682d6621f1856ea3
author Brad Ebinger <breadley@google.com> 1476469993 +0000
committer android-build-merger <android-build-merger@google.com> 1476469993 +0000

Merge "Restrict SipProfiles to profiles directory DO NOT MERGE" into lmp-dev am: b85ded74dc  -s ours am: ef97df841f
am: 130e997964  -s ours

Change-Id: I03f1cffd92672e4349aa902fa38d1f3cacf9c749