tree 050664c9b935dcac205cdf2c657109f9c1a71a77
parent 17d8e4160f0c34fffe692d9d799049efc74ed3e4
parent 99b70f3f5d051261229d1792c169a374fc23326b
author Joe Fernandez <joefernandez@google.com> 1318455598 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318455598 -0700

am 99b70f3f: (-s ours) DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29

* commit '99b70f3f5d051261229d1792c169a374fc23326b':
  DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29