| commit | 3744cf0a5d633e5229dd3393025c08cc7e7d7277 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Oct 02 09:55:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:55:23 2013 -0700 |
| tree | d8427da1885b28def3a6ec62fb1404765d99c136 | |
| parent | 8a3d19665983035602898579f09bbed3c8584a12 [diff] | |
| parent | e486e25cdbdd2ca5ae2fb4d8132daa8dab675dc0 [diff] |
am e486e25c: (-s ours) Merge "Fix CTS tests. Do Not Merge." into klp-dev * commit 'e486e25cdbdd2ca5ae2fb4d8132daa8dab675dc0': Fix CTS tests. Do Not Merge.