tree f24fc6b2f370790941d0b0e04ff443571c8727cb
parent 2d38fced00a873da8077a5193b2d5ef8603dcc66
parent 345eb225ae2e87e36354be5f1e62301179482804
author Elliott Hughes <enh@google.com> 1377207254 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377207254 -0700

am 345eb225: Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.

* commit '345eb225ae2e87e36354be5f1e62301179482804':
  Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.