tree 474c09635dac30d2ce4c1d24d5b4aba79c830ed5
parent 59592336d5dd915bb195de139a53d872152653a2
parent 82be08990bc73134ae8b0e2a7e94e2a28a82d675
author Xavier Ducrohet <xav@android.com> 1296326396 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296326396 -0800

am 82be0899: (-s ours) Update platform version for SDK component. DO NOT MERGE.

* commit '82be08990bc73134ae8b0e2a7e94e2a28a82d675':
  Update platform version for SDK component. DO NOT MERGE.