am 9fd0cf81: am 345eb225: Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.

* commit '9fd0cf81702d083b39a839b07ad75d2ff0ac277d':
  Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
This commit is contained in:
Elliott Hughes 2013-08-22 14:36:54 -07:00 committed by Android Git Automerger
commit aa3defdecb

Diff Content Not Available