tree cba62d0d64153aa2169651696bc238591341d679
parent 183cec2a2e0cdedfb476f7a5db3dd11564a5a6d7
parent 76fffaeaa2963b9cd777f49ce297ef1d0760cd15
author Chris Wren <cwren@android.com> 1414085551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085551 +0000

am 76fffaea: am 41307509: am f6a22ada: Add auto-detection of payload type

* commit '76fffaeaa2963b9cd777f49ce297ef1d0760cd15':