tree 82a20b3428bd367eea367d00c2c6239bf8d956d5
parent c85a49620bc989d2d7bfe5fbcb52c3486f65d73d
parent 4dc3ff9ff9bfbeb1a1926a7e05769260aa6c5588
author Esteban de la Canal <estebandlc@google.com> 1442251634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442251634 +0000

am 4dc3ff9f: am 55a3b73f: Merge "Fixes unnecessary multi-merge steps."

* commit '4dc3ff9ff9bfbeb1a1926a7e05769260aa6c5588':
  Fixes unnecessary multi-merge steps.