Chris Craik f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. ...

Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e

2014-11-20 16:38:06 -08:00

..

androidfw

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

common_time

Update calls to IInterface::asBinder()

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

hwui

resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.

2014-11-20 16:38:06 -08: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