| commit | 8c50336dd8c48b1813fad65d2f7e9e2379ae5101 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 09 17:30:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 09 17:30:15 2015 +0000 |
| tree | e02f33de30dca7121f9eb76c9381cedcd088ff98 | |
| parent | ee9451080c90ced53e83e8e08a77009030e5a681 [diff] | |
| parent | f7eab76f02ef8b6e01d9b1781a7225d987c14c0a [diff] |
am f7eab76f: am 72dfc98b: am dc53c309: am 37e22974: am 8314370e: am 65b23f92: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev automerge: 76b1710 * commit 'f7eab76f02ef8b6e01d9b1781a7225d987c14c0a': Cts test fix for shortcode 48000