| commit | 6e5e56a39512c65001789f33afae25956f437cce | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Oct 22 22:27:51 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 22 22:27:51 2015 +0000 |
| tree | aa909d340da83222a14428a89622bcfbc1645628 | |
| parent | ac0318fa8afe20b00342d41d10e0054f9a8f541a [diff] | |
| parent | b3a53cebdb51e50fe7ddd670b306271268f19d18 [diff] |
resolve merge conflicts of 7899c8cffa to mnc-dev. am: b3a53cebdb * commit 'b3a53cebdb51e50fe7ddd670b306271268f19d18': Aligned ps_pic_pu to 4 bytes