commit | 130e997964ab8ddc1737a099682d6621f1856ea3 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Fri Oct 14 18:29:14 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 18:29:14 2016 +0000 |
tree | 74682f6566fe6c8979f04b4736a54de7b4a1d668 | |
parent | ddbfb2a6f185024c68a38f510c09faa7baf7a2b8 [diff] | |
parent | ef97df841f89fca221f2a2a0fc6bd6102dafa372 [diff] |
Merge "Restrict SipProfiles to profiles directory DO NOT MERGE" into lmp-dev am: b85ded74dc -s ours am: ef97df841f Change-Id: I0ea3b896f6921de05a3836020288950bbd6a538a