| commit | d5fb7826823fa3fb45f8f06c9c1a781dd60210f8 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Apr 01 13:00:10 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Tue Apr 01 13:13:13 2014 +0100 |
| tree | daef364edd52bfa89e5469db02f38a6a3e99626a | |
| parent | 6a9f2b1250e276267ce146777fbe6084f8fa7a3f [diff] |
Bring main.mk in sync with master. These lines were removed in aosp in commit e2d27887b but a bad merge conflict resolution left them in master. Subsequent changes on master started using these variables so they're being brought back. Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94