| commit | 22f7e4b072449cea52a35a5366e9831f08a3a079 | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Fri Jun 19 22:22:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 19 22:22:55 2015 +0000 |
| tree | f2e18012a1b8d4bc0a31ade7a9a586b74c1eecb7 | |
| parent | 1fb7bc99fdb327eab956cf4b1f1031c33940659e [diff] | |
| parent | 1703b3273b39acfdc64731bc50eea7c33c796c92 [diff] |
am 1703b327: resolved conflicts for merge of cb093b1c to mnc-dev-plus-aosp * commit '1703b3273b39acfdc64731bc50eea7c33c796c92': Clean intermediate files if SANITIZE_TARGET has changed.