Sergio Giro f236d7ffad resolved conflicts for 31e5ded6 to master ...

Change-Id: Iae4e1abe697f1c00a82b54c17afa7d4edddc006b

2015-10-01 11:19:34 +00:00

..

androidfw

Merge "Load app resource as shared library."

2015-09-09 16:08:12 +00:00

common_time

Update calls to IInterface::asBinder()

2014-11-17 10:05:31 -08:00

hwui

resolved conflicts for 31e5ded6 to master

2015-10-01 11:19:34 +00:00

input

Frameworks/base: Wall Werror in libs/input

2014-11-10 15:55:11 -08:00

storage

Update calls to IInterface::asBinder()

2014-11-17 10:05:31 -08:00

usb

resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp

2014-09-19 16:13:49 -07:00