tree 89ee325205fb4faa76ca6e061acd881f06194b1a
parent 57272f057c4728b5d53f80dd37f9abae06fc3ecd
parent 0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5
author Dan Sandler <dsandler@android.com> 1389627500 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389627500 -0800

am 0b95b14f: Merge "Quick patch for b/12446428." into jb-ub-now-kermit

* commit '0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5':
  Quick patch for b/12446428.