tree 24d8d35a20dbd53425788c5409b6c42b44885d3c
parent 8fbf284cc83263a6b5ce37afe9a14e8f06d8c317
parent 3a1eb8fc1c389585c18526b03cf6fa153fb9391f
author Xavier Ducrohet <xav@android.com> 1316759987 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316759987 -0700

am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge.

* commit '3a1eb8fc1c389585c18526b03cf6fa153fb9391f':
  Cherry-pick 7fb4cc from master. do not merge.