Commit d1759f5e authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/honeycomb' into manualmerge 

Conflicts:
	tests/tests/hardware/src/android/hardware/cts/CameraTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: I3ead5d59f72aaa760cac3aa694aec669607d64f4
parents d188ecde 75ba8288
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