| commit | 810a62236ca892be3001bc24c325f41fe754efff | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Tue Jul 14 18:59:40 2015 -0700 |
| committer | JP Abgrall <jpa@google.com> | Tue Jul 14 18:59:40 2015 -0700 |
| tree | 7d549be180f8fc8e854a2575dbf7b4e3c09b9da3 | |
| parent | 9feaaaf44682c72dc5c771c93ef01ec793b6a7e3 [diff] |
Fix CTS build Revert "Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev" This reverts commit 9feaaaf44682c72dc5c771c93ef01ec793b6a7e3, reversing changes made to 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd.