tree afb1a8ebe73639cdd3d4be4ba303e04e7fa0f0d8
parent ab997d9e46fa3c9ecc74dc0103afb5f4310f4a8c
parent b1092aea05acd4bebe671cbd6fd2ea39df0898cb
author Brett Chabot <brettchabot@google.com> 1353967950 -0800
committer Brett Chabot <brettchabot@google.com> 1353967950 -0800

resolved conflicts for merge of b1092aea to jb-mr1-dev

Change-Id: I0eb1f731b77049d32569b5e753fefa4900c0c088