tree f72714a7d3462ce4dc44510386816ffcab70ea17
parent ae118966dacfba0e0cd8425cf9059148262ea973
parent 6b78fad147c772075eae5cfc25f5a50748bc4015
author Elliott Hughes <enh@google.com> 1373595138 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373595138 -0700

am 6b78fad1: am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.

* commit '6b78fad147c772075eae5cfc25f5a50748bc4015':
  Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.