tree ab346b5390fb1f343ef582425d01ad59a0265685
parent 4aa10b1bc14290397756b05e97ff9bc8a3b7564b
parent 35d3af70da9740a81eb8eda5a7f87e6f396fb151
author Scott Kennedy <skennedy@google.com> 1363291916 -0700
committer Scott Kennedy <skennedy@google.com> 1363291916 -0700

resolved conflicts for merge of 35d3af70 to jb-mr2-dev

Change-Id: If85946ef3dbf82eb3a790adf320765e4a25d91dc