tree 83268258c6242ef16839c89ecad0010b211b779b
parent ec5a8473253c4458b996cbfba6ed8b0bbb82ef5f
parent 690af1285c320a1d3fc31cc57414347c74bd8e1d
author Chet Haase <chet@google.com> 1358276486 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358276486 -0800

am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* commit '690af1285c320a1d3fc31cc57414347c74bd8e1d':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e