tree dfc17b31990e2429535609b85f6d080c4fa0d9fe
parent 890d9a2952301682ffecaed4495f5f65c84c3642
parent 02cf98d65c798d368fcec43ed64a001d513bdd4f
author Tor Norbye <tnorbye@google.com> 1408487105 -0700
committer Tor Norbye <tnorbye@google.com> 1408487105 -0700

Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	build/scripts/tests.gant

Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784