tree 2f36324e4fa016e1d7e31780d53f4e9567fc807d
parent 66ad0ccd647315b6f5d4206048376c1b4798a5f4
parent ae3c9c48748f5e536610159ca67a8b344092e500
author Brian Muramatsu <btmura@google.com> 1315610557 -0700
committer Brian Muramatsu <btmura@google.com> 1315610745 -0700

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