commit | edf31faae75dd0ef4415bb9c480475eb02572642 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Fri Oct 14 19:03:13 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 19:03:13 2016 +0000 |
tree | 0600543e99e663f1688e5038259685f58b1bfb82 | |
parent | fe339bb8f2dd2d2309a45d2dd033690d1fafaee5 [diff] | |
parent | 42c2d35477ec57e3b8357772d37dbe67fa6c38fa [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 Change-Id: Iec19164cc7a87c26647f62d33fd3ae1dfb9678e9