tree 60e01d1b54244b5da6a07286d5794b6fb7346442
parent a20a97c95cad7b795d82d3e7892955f68a5b9803
parent e6b39358d7e514198c8643b451a2dd7657cd9a00
author Irfan Sheriff <isheriff@google.com> 1287414275 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287414275 -0700

am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread

Merge commit 'cf66f587514a935c290c8c9558243a48ba0243eb'

* commit 'cf66f587514a935c290c8c9558243a48ba0243eb':
  fix build DO NOT MERGE