tree 42fdf22f18dc4097c2f86cbd691fe6b1c8bd3820
parent 60151a295ccf726238dc47456d80b427db6d6a38
parent 54e2e86c5740a2c7a02e95e94c4aff362a5502cf
author Doug Zongker <dougz@android.com> 1250543491 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250543491 -0700

am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch

Merge commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf'

* commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf':
  do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch