| commit | 28c9b037e795ce4df9cea30096c59f76634692e9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jun 03 22:23:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 22:23:12 2015 +0000 |
| tree | 5184f3464efacea7c562a9e831236905ad5f4010 | |
| parent | 72c0bd4697fe4ad4b2e762ad1dcf4baa2181bcb2 [diff] | |
| parent | bdf319d1d22908e1751a448f16492254344b7c0a [diff] |
am 5b3ca7b1: resolved conflicts for merge of de28adf3 to mnc-dev-plus-aosp * commit '5b3ca7b12e5645ed69bc27d79509f16a1bebb8dd': Don't say "update package missing" unless we mean it.