Adam Lesinski 3fd340028f Merge commit '78be0498' into manualmerge ...

Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c

2014-11-03 18:06:22 -08:00

..

androidfw

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08:00

common_time

resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

2014-03-27 12:50:58 +00:00

hwui

am 541641d0: Merge "Fix counting" into lmp-mr1-dev

2014-11-03 18:42:30 +00:00

input

Add cursor flags into SpriteController to suppor async cursor updates.

2014-07-28 22:04:06 +00:00

storage

Installing splits into ASECs!

2014-08-22 16:25:04 -07:00

usb

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

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