tree 540e5f4ed08bb03f286e16ca736cc26916977cd5
parent 9b69b2c5bc1d3970391546387c8921ad75240ecb
parent 9fad0d7751a109b26b091049b83ea1cd980f7c96
author Daniel Xie <dxie@google.com> 1441404162 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441404162 +0000

am 9fad0d77: am 5e6120eb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev

* commit '9fad0d7751a109b26b091049b83ea1cd980f7c96':
  Revert "Cts test fix for shortcode 48000"