| commit | 992853c59abbd07f24571537f5b7f76a9c9e237e | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Mon Jan 11 02:32:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 02:32:08 2016 +0000 |
| tree | 18f93dee7cb5448005126d7846a6e06ba4070995 | |
| parent | 06f1087a94f1e48298e89d77ccc51a0ced871958 [diff] | |
| parent | 11a3dc18583b6c19b52aa27a8d83136f9d5fc1ef [diff] |
resolve merge conflicts of bbe98b40cd to mnc-dr2-dev-plus-aosp. am: 11a3dc1858 -s ours * commit '11a3dc18583b6c19b52aa27a8d83136f9d5fc1ef': Update libpng to 1.6.20
