tree 0ba72f5de1949e0527874a799baa224cbe1537e0
parent b03a5855292feb8c331815f883fe64372aacd872
parent 2e5965e996aad62ab1338b09d54caaf99ff3dd6a
author Tor Norbye <tnorbye@google.com> 1406319036 -0700
committer Tor Norbye <tnorbye@google.com> 1406319036 -0700

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

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143