| commit | 0852bee4a9b363de1c361b1a12564dc59ded1771 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Tue Jul 14 18:59:40 2015 -0700 |
| committer | Bart Sears <bsears@google.com> | Tue Jul 14 19:13:31 2015 -0700 |
| tree | 409d97aed7b951cb7b5280715cdbd293289044a3 | |
| parent | 75cabb40dbc238f7a3445cd148808bfd343ce9a9 [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.