| commit | 73e4cedc325950d78d78e28e9a24879b80d12330 | [log] [tgz] |
|---|---|---|
| author | Lars Greiss <kufikugel@googlemail.com> | Sat Dec 07 12:30:42 2013 +0100 |
| committer | Lars Greiss <kufikugel@googlemail.com> | Sat Dec 07 14:44:42 2013 +0100 |
| tree | dcfde27f4fb4d89d87e0a6eeb44a363cf3a270ba | |
| parent | f4ad20044ae5e6a6ca8916875b59004a66333410 [diff] | |
| parent | 88ab1e5643081d91ae50562b6c57d47d7681de55 [diff] |
Merge tag 'android-4.4.1_r1' into HEAD Android 4.4.1 Release 1 Conflicts: BoardConfig.mk BoardConfigCommon.mk full_grouper.mk kernel self-extractors/widevine/staging/staging/BoardConfigPartial.mk sepolicy/app.te sepolicy/device.te sepolicy/file.te sepolicy/file_contexts sepolicy/sensors_config.te sepolicy/surfaceflinger.te Change-Id: I92d7e9a7c43f171779ce69f5b44c6b086e74bc83