am 345eb225: Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.

* commit '345eb225ae2e87e36354be5f1e62301179482804':
  Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
This commit is contained in:
Elliott Hughes 2013-08-22 14:34:14 -07:00 committed by Android Git Automerger
commit 9fd0cf8170

Diff Content Not Available