| commit | 9cce00c418a55ddc51573b4bad7a7841bf389378 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 21:34:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 21:34:04 2015 +0000 |
| tree | 2739a700c2c306220514f2de83f3cb3a54c590bc | |
| parent | f1e31663a84d504aa19cf08e5b6970fcffc55912 [diff] | |
| parent | bf2a69dd5eac3bf8a95844b03bcf8c9843026714 [diff] |
am bf2a69dd: am 76b1710a: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev * commit 'bf2a69dd5eac3bf8a95844b03bcf8c9843026714': Cts test fix for shortcode 48000