tree b7ee26c8dc4a4762dde43ee459db2e02e8b50e42
parent f03960f7a64bf636a46282a67a18bc2351e514b0
parent f6a22ada816ae4f63576679f03472b0a984e82be
author Chris Wren <cwren@android.com> 1387229171 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387229171 -0800

am f6a22ada: Add auto-detection of payload type

* commit 'f6a22ada816ae4f63576679f03472b0a984e82be':
  Add auto-detection of payload type