commit | c20b37c2ae382292285e8cce77005d59eea6cf47 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Fri Oct 14 19:10:17 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 19:10:17 2016 +0000 |
tree | fc677e03b53f555008fa209c720b426915a389c9 | |
parent | 5ae84d1467ed9c57f520f84460b437afb310f548 [diff] | |
parent | edf31faae75dd0ef4415bb9c480475eb02572642 [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 am: 42c2d35477 am: edf31faae7 Change-Id: Idc524f1489578e50a7a01f6a975928c2ebe9a147