tree 15868f57e47f4c68470a15985b6a5b449168ab83
parent 72a533adacfe7de749408d1866147ead6fa9b7be
parent 22902f541e61bf9a1030fd87683102fe125ec135
author Matthew Williams <mjwilliams@google.com> 1378764777 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378764777 -0700

am 22902f54: am bec23ea9: Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev

* commit '22902f541e61bf9a1030fd87683102fe125ec135':
  Preserve CTS fail behaviour on null bundle for old API