| commit | 1900bb5f9c266e661baa229815b1c5dbd84ec8cb | [log] [tgz] |
|---|---|---|
| author | Tri Vo <trong@google.com> | Fri Nov 09 14:38:25 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 09 14:38:25 2018 -0800 |
| tree | a66309eab58383351831287639f5eb69b6cec699 | |
| parent | e37af7de5fd68f647b66cc32a3c0cecee5102a21 [diff] | |
| parent | 14b922bd01ff13c0e7cf1e1f802ef52d58d5d5a7 [diff] |
Merge "Use LOCAL_ADDITIONAL_M4DEFS for file_contexts" am: 3e8f7bcda5 am: 14b922bd01 Change-Id: I5298f1ff700cfef15ecb42138a1fa970071757e4