Commit 633c6f1b authored by Colin Cross's avatar Colin Cross
Browse files

Merge commit 'v3.4.5' into android-3.4 

Conflicts:
	drivers/base/power/main.c

Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0
parents b95d9dd5 763c71b1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment