[build] Merge tag 'android-cts-5.1_r3' into dev

Android CTS 5.1 release 3

Conflicts:
	core/build_id.mk
This commit is contained in:
Firefly
2015-10-17 14:31:20 +08:00
committed by djw
parent 60b1e2f429
commit 2572814bd4

View File

@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
export BUILD_ID=LMY48G
export BUILD_ID=LMY48W