| commit | d4357ffd92a1b8de5e8cdfa2d8665214a0419c98 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Fri Jun 05 17:09:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 17:09:20 2015 +0000 |
| tree | ff71b96e5b45fc05bb242aace0052868f0c92444 | |
| parent | 23cfb64c6aca636b09651409062cc14a97a88984 [diff] | |
| parent | eb974d5ac4b8733e4788066ec9ac6cf2bfb75c9b [diff] |
am eb974d5a: Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev * commit 'eb974d5ac4b8733e4788066ec9ac6cf2bfb75c9b': More inclusive rules for using outsets.