| commit | e12b97e0602ca8f21c83ad0f2d4a08b360230b60 | [log] [tgz] |
|---|---|---|
| author | Wileen Chiu <wileenc@codeaurora.org> | Mon Oct 15 11:20:37 2018 -0700 |
| committer | Wileen Chiu <wileenc@codeaurora.org> | Mon Oct 15 11:20:37 2018 -0700 |
| tree | 2bd4f0d74909e80edce7261c796cfe9b6da38b5c | |
| parent | b4d76c74d94c20eea0d3b4fb4f698307e9a88a4b [diff] | |
| parent | 64aa6bd9bc430409f354f0e906cbe1620df9e913 [diff] |
Merge remote-tracking branch 'remotes/origin/atel-prop.lnx.3.0' into atel-prop.lnx.4.0 Change-Id: Ib82ab67cfe2c40ea97138a6c77ddfc2e9414b876 Conflicts: internal/Android.mk