| commit | cbf494809770e913bf406492e84994dbd0ba121e | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Jul 13 22:39:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 22:39:02 2015 +0000 |
| tree | 80a2efd067de55d15b92d26c4322f0259a701f1c | |
| parent | 04d3daff8006d6a8584bfc05242181119f2af096 [diff] | |
| parent | 0564deb185675b53081befffe48ccac9a0b4dcca [diff] |
am 0564deb1: (-s ours) am 741b6acb: am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev * commit '0564deb185675b53081befffe48ccac9a0b4dcca': Remove android.util.Log from FileUtils