commit | 8865b320a4866622db8c7e32d59b13f1a7314094 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Fri Oct 14 18:53:14 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 18:53:14 2016 +0000 |
tree | eede7a75db4946facbc91858e55f33659abc8cf6 | |
parent | 073d7ded04f25cc507ab007a073f3c7c4f159e7e [diff] | |
parent | e6c7099e82f274f843430806c7bd7ad87a138fb1 [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 Change-Id: Ia4389a737bcc2e90cc5db67c6a2b5b8587a85e8c