Commit 9c5aa280 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/honeycomb-mr2' into ics-mr0 

Conflicts:
	apps/CtsVerifier/jni/verifier/com_android_cts_verifier_os_FileUtils.cpp

Change-Id: I2d92aea5a045dca9e758f7cc2d2746ddb52bd726
parents a9f8ec99 b1b3e442
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