| commit | 6571935ef5e4d09266fc4ee23c644a249d990954 | [log] [tgz] |
|---|---|---|
| author | Aaron Whyte <awhyte@google.com> | Tue Jun 03 18:14:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 18:14:17 2014 +0000 |
| tree | 9e6d75504362cc4c955fefd27239c6b9528f71a2 | |
| parent | 484c0fbe29c9fe00b266a4db68fba13a0f06d026 [diff] | |
| parent | 536c73cb5d9848c4b6c3fb112df192b20640f339 [diff] |
am 536c73cb: am bd87555b: Merge "Fixes CTS test, matching Master. Bug: 15131296" into klp-modular-dev * commit '536c73cb5d9848c4b6c3fb112df192b20640f339': Fixes CTS test, matching Master. Bug: 15131296