| commit | 96557b590e0a0749f0b76662fb7cc72d6d00a117 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 08 18:32:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 18:32:36 2015 +0000 |
| tree | abefeeea0b83bff03759602cda415300e82a6590 | |
| parent | ea6ba650ef21b6e909fbd9374b167f508241960b [diff] | |
| parent | ea59f60b38d9b2f7033d5e85779fc114dbb2395c [diff] |
am ea59f60b: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours automerge: 4e80dc1 * commit 'ea59f60b38d9b2f7033d5e85779fc114dbb2395c': DO NOT MERGE: Cts test fix for shortcode 48000