| commit | ceb0b50f974da07872fec78c4151e6a3cab7abb7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:55:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:55:46 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | d4d2f48fa78505f504b5cdf73b61dbdcc2e5bfc9 [diff] | |
| parent | 9ccf4bfbde288119e6e90f9ad58351a5d2c59ff9 [diff] |
am 9ccf4bfb: (-s ours) resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp * commit '9ccf4bfbde288119e6e90f9ad58351a5d2c59ff9':