| commit | 70df98e177f6e03af7c7ab830b1174f6838cb6c9 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Jun 11 22:49:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 22:49:55 2015 +0000 |
| tree | a6fcd16fc1570712b7a544bffd0c801cc2366f23 | |
| parent | d9f05542ff7efa5330a7b6cc4783d00dc9824b6f [diff] | |
| parent | 5097d08acd530af85f35f8785aa5d9cbd8982f90 [diff] |
am 5097d08a: am 8dc79614: am 9830c42c: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev automerge: c304eed * commit '5097d08acd530af85f35f8785aa5d9cbd8982f90': Revert "Cts test fix for shortcode 48000"