| commit | 4d50766273d99194d056a88b647359c5eb570eb0 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Fri Jun 05 17:09:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 17:09:12 2015 +0000 |
| tree | cab19c23d0ae32b2f6fa29858e58a41e341b3aec | |
| parent | 743c5c76dddb2eca2750620de7ec9e02cf064798 [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.