| commit | 69140da3472013f15a8f37f8c429deb06e9dfb9e | [log] [tgz] |
|---|---|---|
| author | Paul Beeler <pbeeler80@gmail.com> | Tue Jun 10 00:48:58 2014 -0600 |
| committer | Paul Beeler <pbeeler80@gmail.com> | Tue Jun 10 00:48:58 2014 -0600 |
| tree | 00dfbc79dfca7ab7ed1a7fe7cefd597eaf79a1d4 | |
| parent | 9bec43986b33df22a49e1675c053e0fa5f889276 [diff] | |
| parent | 29671b585789224cd5095a7257bd9ee3f3eb20f3 [diff] |
Merge remote-tracking branch 'aospal/kitkat-staging' into kitkat-staging Conflicts: products/pa_deb.mk products/pa_grouper.mk products/pa_maguro.mk products/pa_mako.mk products/pa_manta.mk products/pa_tilapia.mk products/pa_toro.mk products/pa_toroplus.mk