| commit | ea59f60b38d9b2f7033d5e85779fc114dbb2395c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 08 17:32:48 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 08 17:32:48 2015 +0000 |
| tree | 2592dc50fb9149b25d09eb33f58c2d35d281cb75 | |
| parent | bbf39ae4507ab49f21c4c62a0df0e0eed99c7d80 [diff] | |
| parent | 4e80dc172692f81784532e9b29ebdedce7b45b91 [diff] |
Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours automerge: 4e80dc1 * commit '4e80dc172692f81784532e9b29ebdedce7b45b91': DO NOT MERGE: Cts test fix for shortcode 48000