tree 523d5e7bf08989f0b13adea350cb82a153a9cfa1
parent 016338e0ec30f566d7659f4ea91bc786cf93845e
parent 06485c81bbc79b02acfbe986e378216adab573c2
author Andrew Hsieh <andrewhsieh@google.com> 1379469505 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379469505 -0700

am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"

* commit '06485c81bbc79b02acfbe986e378216adab573c2':
  Move Teapot to android-17 and set APP_ABI := all