tree 4b49e234a927329adfe8e59de8446a26303119a9
parent c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5
parent 34c98df78a80881698f63ce0815f3e16823d85e0
author Doug Zongker <dougz@android.com> 1250622815 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250622815 -0700

am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master

Merge commit '34c98df78a80881698f63ce0815f3e16823d85e0'

* commit '34c98df78a80881698f63ce0815f3e16823d85e0':
  do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master