Commit 92e32358 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/gingerbread' into honeycomb 

Conflicts:
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tests/tests/security/src/android/security/cts/CertificateTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: Ieb48bc2906fbc9f07e6cf4e161a3dc0195aedcc2
parents 66ad0ccd ae3c9c48
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