resolved conflicts for merge of a7fa30f3 to master
authorFred Quintana <fredq@google.com>
Fri, 21 Feb 2014 05:54:02 +0000 (21:54 -0800)
committerFred Quintana <fredq@google.com>
Fri, 21 Feb 2014 05:54:02 +0000 (21:54 -0800)
commitfdc253558b0e9ec5d5ac8b9ac480bf6eb2da9bd1
tree0c698d91ef059c55a4288b76b5e92b13f10a3dfe
parent1f2c2c560400ba60c5b9dfd6fd4f5e73b232803a
parenta7fa30f3b96fc2740e779e539e78bde906d5ec40
resolved conflicts for merge of a7fa30f3 to master

Change-Id: Ifcdb3e10bbbb08711d3f8bdafa384e092bf1a7db
AndroidManifest.xml