tree 6095abd8e6dd8d599a6f7246f4a9fb7e6640ba04
parent 402d3fd41838dc6a098ec3482f83b20b32df29f4
parent fb30566416499d441718af4bc9956404270f25ec
author Mathias Agopian <mathias@google.com> 1321420408 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321420408 -0800

am fb305664: Merge "should fix sdk build" into ics-mr1

* commit 'fb30566416499d441718af4bc9956404270f25ec':
  should fix sdk build