am 0155a90e: Merge "How did that get there?" into klp-dev

* commit '0155a90eb4197a9aa1f8d53c90b02e5b53167183':
  How did that get there?
This commit is contained in:
Daniel Sandler
2013-08-13 22:30:10 -07:00
committed by Android Git Automerger