| commit | 536c73cb5d9848c4b6c3fb112df192b20640f339 | [log] [tgz] |
|---|---|---|
| author | Aaron Whyte <awhyte@google.com> | Tue Jun 03 18:06:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 18:06:58 2014 +0000 |
| tree | 369f962121f8aae47c7a0607c148ff03d40fb9f7 | |
| parent | 786f94d950f99c8c7b41251755dc7182af7894d7 [diff] | |
| parent | bd87555b58ef6498e2e1b2d7ede3fcb09ebcf4fd [diff] |
am bd87555b: Merge "Fixes CTS test, matching Master. Bug: 15131296" into klp-modular-dev * commit 'bd87555b58ef6498e2e1b2d7ede3fcb09ebcf4fd': Fixes CTS test, matching Master. Bug: 15131296