| commit | de983b0f3e09cf4bba162a5358e63321d107639b | [log] [tgz] |
|---|---|---|
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | Tue Mar 08 16:56:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 08 16:56:02 2016 +0000 |
| tree | 64214325e290f963a1e9606005cc8b6b15e24e86 | |
| parent | bbb70c895beafe917400fa69efb021d4e93a4e01 [diff] | |
| parent | 6abf0dc3da22156c3992c8ab999d4966fea20d89 [diff] |
resolve merge conflicts of 9c41490ca7 to nyc-dev-plus-aosp am: ce2ea3837c * commit 'ce2ea3837cbe6926b5d49038fb858c8fb49b82fc': Allow building with Python 3.x