resolved conflicts for merge of 3b0c40cf to master
authorElliott Hughes <enh@google.com>
Mon, 28 Apr 2014 20:58:46 +0000 (13:58 -0700)
committerElliott Hughes <enh@google.com>
Mon, 28 Apr 2014 20:58:46 +0000 (13:58 -0700)
commit3a203e4a58bf5ee03c3303df6a04e43a4eefb1eb
tree20e96ac964fa3c7ec6a639ef81086abc741606e2
parent8b36635d727451930ef4939aad25148c05c66b09
parent3b0c40cfc0048db9b0bcadabae802446e7667588
resolved conflicts for merge of 3b0c40cf to master

Change-Id: I9e3b0735950cb1e495ecd58590b5d6e1f253bc88