| commit | e8e6ed75d1c16c31053aea05f7a56afe53790f36 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 08 21:15:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 21:15:07 2015 +0000 |
| tree | 405ff9825c9def47afc2c0d13a0853bdbc8b90d3 | |
| parent | e4aaeeb7973e4a7d7b843e04dfe63c49739bcde7 [diff] | |
| parent | c57c285f2fc479d3cea25f8ec4e018e9a15bdf55 [diff] |
am c57c285f: am 24381288: am 96557b59: 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 'c57c285f2fc479d3cea25f8ec4e018e9a15bdf55': DO NOT MERGE: Cts test fix for shortcode 48000