tree 73431012d9e8d9c94175b7378c0f1f43ddadd9c3
parent f59a64b7cba7330701b8791698e67abff8afde65
parent 7159a992ddcda51c91843a29cd1aa30815bc8370
author Jean-Baptiste Queru <jbq@google.com> 1344970519 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344970519 -0700

am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"

* commit '7159a992ddcda51c91843a29cd1aa30815bc8370':
  Set the AOSP master to be API level 16