tree 519b6d05c604772a51202b952f6570829891cdb2
parent cd4e323e0eb4c01e36233dde15500c57d7f2da4d
parent a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1
author Ying Wang <wangying@google.com> 1301620080 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301620080 -0700

am a9be570b: resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp

* commit 'a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1':
  Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.