tree 76decfb3114af9fbcf85ca6f1c99c94177642023
parent c44205cf717fc8ab8ccaf3631032fa236ba61a86
parent 713fe6463e6ff8cb9689aa8ead88c885d25d03aa
author Elliott Hughes <enh@google.com> 1377206875 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1377206875 +0000

Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."