Yusuke Sato 53a19bb967 resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp ...

Change-Id: Ie32db11e6c1062df32b16a5cd6fcd219e0bdc017

2015-06-29 13:09:51 -07:00

..

androidfw

resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp

2015-06-29 13:09:51 -07:00

common_time

Update calls to IInterface::asBinder()

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

hwui

Merge "Don't promote functors onto layers due to outline rect clipping" into mnc-dev

2015-06-26 20:28:36 +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