Steve Block 2e681c1b09 resolved conflicts for merge of 08289f55 to graphics-dev ...

Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7

2012-01-09 23:24:46 +00:00

..

binder

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

camera

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

cpustats

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

diskusage

Move disk usage utilities to its own library

2010-11-30 16:51:13 -08:00

gui

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

hwui

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

rs

resolved conflicts for merge of 08289f55 to graphics-dev

2012-01-09 23:24:46 +00:00

storage

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

surfaceflinger_client

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

ui

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

usb

am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak

2011-04-11 14:24:11 -07:00

utils

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00