John Reck 111928fa32 resolved conflicts for merge of 4142f026 to master ...

Change-Id: Iabe3aa0ac6911a26d2ba7219f18332897276ed6f

2015-03-24 08:34:23 -07:00

..

androidfw

Output modified bcp47 tag in ResTable_config::toString()

2015-03-16 22:25:26 +00:00

common_time

Update calls to IInterface::asBinder()

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

hwui

resolved conflicts for merge of 4142f026 to master

2015-03-24 08:34:23 -07: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