| commit | 6f0c4163f57285a8cad6c8ea8af22bf449f175f2 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Fri Oct 14 18:42:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 18:42:42 2016 +0000 |
| tree | 3f83cbb6182d59ac2a430b031a42bb97df479fb7 | |
| parent | 681864b209d3c779829be57d2ae26b645a60ba31 [diff] | |
| parent | 87182fd52c265872968498e5ce34cf9ebaec0ee6 [diff] |
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 Change-Id: I78d913a1ad953f66d9bc22679691124f6854f208