| commit | 56ba1b68bbf09f784ff2c9b8d12e85d6107f33a6 | [log] [tgz] |
|---|---|---|
| author | TheMrcool212 <themrcool212.android@gmail.com> | Tue Jun 03 12:15:58 2014 +0800 |
| committer | TheMrcool212 <themrcool212.android@gmail.com> | Tue Jun 03 12:15:58 2014 +0800 |
| tree | 1dff57292bfe4d609edc5d6348505b6550f9712b | |
| parent | 2c72fa56621705cc70e660b11c8a73b82b298d1a [diff] | |
| parent | f7eda049155c87a5fa2623b8868397a445e249f7 [diff] |
Merge remote-tracking branch 'PA/kitkat' into kitkat Conflicts: main.mk