tree f61642771ba03a6460b975db4c9619d1eeff773d
parent 73c024cb70e74a20e75bc04ea1a7b85256505329
parent 918d5799b88bc3483c04b5948ce6a07253adc1c4
author Daniel Xie <dxie@google.com> 1437610337 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1437610337 +0000

Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev