tree 2a71b58b60c3ea96d1e3f34eb5ad77ce28d69895
parent c1b26007a49cc6bf9483800b76f039c778335990
parent dc6a269f821073fc4bb4cf0f463e09ef15619fd3
author Xavier Ducrohet <xav@android.com> 1323993350 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323993350 -0800

am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours

* commit 'dc6a269f821073fc4bb4cf0f463e09ef15619fd3':
  Move platform component to rev3. do not merge.