| commit | 3d582ff93726c82c4c33369490e6857cc2c16d87 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Fri Jun 05 17:21:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 17:21:41 2015 +0000 |
| tree | 5df16c9def143865a769c82fd446020f22f7f36f | |
| parent | 1cb56398adf33e1bc8919f044bf8869323fa816b [diff] | |
| parent | 4d50766273d99194d056a88b647359c5eb570eb0 [diff] |
am 4d507662: am eb974d5a: Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev * commit '4d50766273d99194d056a88b647359c5eb570eb0': More inclusive rules for using outsets.