commit | 42c2d35477ec57e3b8357772d37dbe67fa6c38fa | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Fri Oct 14 18:56:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 18:56:43 2016 +0000 |
tree | b855bbbbbc3a6cbd02d9373ff4f6d1b1ce96bcfb | |
parent | f42cb6aad482488a3a8c94a42438a0a2458d4468 [diff] | |
parent | 8865b320a4866622db8c7e32d59b13f1a7314094 [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 am: 6f0c4163f5 -s ours am: e6c7099e82 am: 8865b320a4 Change-Id: I1c7c60c52bd57426a7928e6e0dcbcedc3ab81df6