tree 69f1661683fa6ef9c8f993b48e04036df97b16cd
parent 6a744d24c552f77698bb872218d675a12554abb8
parent 9830c42cc69aa9edc80ca981b43ce5c8c684033e
author Daniel Xie <dxie@google.com> 1434061638 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434061638 +0000

am 9830c42c: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev automerge: c304eed

* commit '9830c42cc69aa9edc80ca981b43ce5c8c684033e':
  Revert "Cts test fix for shortcode 48000"