| commit | 7f57a511f12cc7cf92343829709038f681e9eb8e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:16:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:16:11 2015 +0000 |
| tree | 4af660acb1f3bfc9054913ee53c86378a0a420c9 | |
| parent | bc5dbf4f9ea81eecd2bbcf52a8367a1c1cde80a5 [diff] | |
| parent | 917c65db91e4b8763ed43a006261bd31faa97c14 [diff] |
am 917c65db: am 954f9f11: am fbcce7cb: am bf4ddcf8: am 7191a2dc: am ec34cbdf: am 841856c4: am 2769a771: am f88b62bc: am 8f997fb6: am 1712bffb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e * commit '917c65db91e4b8763ed43a006261bd31faa97c14':